From a1bd83d7976fbddf9e5caa50f0fa4e3b08b2e97a Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Mon, 1 Feb 2016 16:16:09 +0100 Subject: [PATCH] ai_assert: split 2 checks in one macro to 2 separate ai_assert tests. --- code/SceneCombiner.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/SceneCombiner.cpp b/code/SceneCombiner.cpp index 1027b9d22..b56e2e601 100644 --- a/code/SceneCombiner.cpp +++ b/code/SceneCombiner.cpp @@ -1128,10 +1128,11 @@ void SceneCombiner::Copy (aiTexture** _dest, const aiTexture* src) } // ------------------------------------------------------------------------------------------------ -void SceneCombiner::Copy (aiAnimation** _dest, const aiAnimation* src) +void SceneCombiner::Copy( aiAnimation** _dest, const aiAnimation* src ) { - ai_assert(NULL != _dest && NULL != src); - + ai_assert( NULL != _dest ); + ai_assert( NULL != src ); + aiAnimation* dest = *_dest = new aiAnimation(); // get a flat copy