From 690ebe4f1ed09ce122a05119557f6e41b9edf831 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Fri, 20 Mar 2015 13:34:48 +0100 Subject: [PATCH] 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 --- code/ImporterRegistry.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/ImporterRegistry.cpp b/code/ImporterRegistry.cpp index 685863ea9..b2f7d2686 100644 --- a/code/ImporterRegistry.cpp +++ b/code/ImporterRegistry.cpp @@ -3,7 +3,7 @@ Open Asset Import Library (assimp) --------------------------------------------------------------------------- -Copyright (c) 2006-2012, assimp team +Copyright (c) 2006-2015, assimp team All rights reserved. @@ -142,7 +142,7 @@ corresponding preprocessor flag to selectively disable formats. #ifndef ASSIMP_BUILD_NO_OGRE_IMPORTER # include "OgreImporter.h" #endif -#ifndef ASSIMP_BUILD_NO_OPEMGEX_IMPORTER +#ifndef ASSIMP_BUILD_NO_OPENGEX_IMPORTER # include "OpenGEXImporter.h" #endif #ifndef ASSIMP_BUILD_NO_MS3D_IMPORTER @@ -277,7 +277,7 @@ void GetImporterInstanceList(std::vector< BaseImporter* >& out) #if (!defined ASSIMP_BUILD_NO_OGRE_IMPORTER) out.push_back( new Ogre::OgreImporter()); #endif -#if (!defined ASSIMP_BUILD_NO_OPEMGEX_IMPORTER ) +#if (!defined ASSIMP_BUILD_NO_OPENGEX_IMPORTER ) out.push_back( new OpenGEX::OpenGEXImporter() ); #endif #if (!defined ASSIMP_BUILD_NO_MS3D_IMPORTER) @@ -309,8 +309,8 @@ void GetImporterInstanceList(std::vector< BaseImporter* >& out) #endif #ifndef ASSIMP_BUILD_NO_C4D_IMPORTER - out.push_back( new C4DImporter() ); + out.push_back( new C4DImporter() ); #endif } -} +} // namespace Assimp