v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix https://github.com/assimp/assimp/issues/504: use correct define for check if OpenGEX-importer shall be used or not. 

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
pull/513/head
Kim Kulling 2015-03-20 13:34:48 +01:00
parent 9da69190e0
commit 690ebe4f1e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
code/ImporterRegistry.cpp
View File

@ -3,7 +3,7 @@
Open Asset Import Library (assimp) Open Asset Import Library (assimp)
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
Copyright (c) 2006-2012, assimp team Copyright (c) 2006-2015, assimp team
All rights reserved. All rights reserved.
@ -142,7 +142,7 @@ corresponding preprocessor flag to selectively disable formats.
#ifndef ASSIMP_BUILD_NO_OGRE_IMPORTER #ifndef ASSIMP_BUILD_NO_OGRE_IMPORTER
# include "OgreImporter.h" # include "OgreImporter.h"
#endif #endif
#ifndef ASSIMP_BUILD_NO_OPEMGEX_IMPORTER #ifndef ASSIMP_BUILD_NO_OPENGEX_IMPORTER
# include "OpenGEXImporter.h" # include "OpenGEXImporter.h"
#endif #endif
#ifndef ASSIMP_BUILD_NO_MS3D_IMPORTER #ifndef ASSIMP_BUILD_NO_MS3D_IMPORTER
@ -277,7 +277,7 @@ void GetImporterInstanceList(std::vector< BaseImporter* >& out)
#if (!defined ASSIMP_BUILD_NO_OGRE_IMPORTER) #if (!defined ASSIMP_BUILD_NO_OGRE_IMPORTER)
out.push_back( new Ogre::OgreImporter()); out.push_back( new Ogre::OgreImporter());
#endif #endif
#if (!defined ASSIMP_BUILD_NO_OPEMGEX_IMPORTER ) #if (!defined ASSIMP_BUILD_NO_OPENGEX_IMPORTER )
out.push_back( new OpenGEX::OpenGEXImporter() ); out.push_back( new OpenGEX::OpenGEXImporter() );
#endif #endif
#if (!defined ASSIMP_BUILD_NO_MS3D_IMPORTER) #if (!defined ASSIMP_BUILD_NO_MS3D_IMPORTER)
@ -309,8 +309,8 @@ void GetImporterInstanceList(std::vector< BaseImporter* >& out)
#endif #endif
#ifndef ASSIMP_BUILD_NO_C4D_IMPORTER #ifndef ASSIMP_BUILD_NO_C4D_IMPORTER
out.push_back( new C4DImporter() ); out.push_back( new C4DImporter() );
#endif #endif
} }
} } // namespace Assimp