From 67e8e52a0042fdd5c008540d61d71ca45c2fd45e Mon Sep 17 00:00:00 2001 From: kimmi <kimmi@67173fc5-114c-0410-ac8e-9d2fd5bffc1f> Date: Tue, 27 Dec 2011 17:22:47 +0000 Subject: [PATCH] Fix a compiler warning. git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1102 67173fc5-114c-0410-ac8e-9d2fd5bffc1f --- code/SceneCombiner.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/SceneCombiner.cpp b/code/SceneCombiner.cpp index 8a061609a..c0b63f971 100644 --- a/code/SceneCombiner.cpp +++ b/code/SceneCombiner.cpp @@ -967,7 +967,7 @@ void SceneCombiner::CopyScene(aiScene** _dest,const aiScene* src,bool allocate) dest->mFlags = src->mFlags; // source private data might be NULL if the scene is user-allocated (i.e. for use with the export API) - ScenePriv(dest)->mPPStepsApplied = ScenePriv(src) ? ScenePriv(src)->mPPStepsApplied : NULL; + ScenePriv(dest)->mPPStepsApplied = ScenePriv(src) ? ScenePriv(src)->mPPStepsApplied : 0; } // ------------------------------------------------------------------------------------------------