From 932d163d21046e6a2db7ee447440c84ca6955c60 Mon Sep 17 00:00:00 2001 From: kimmi Date: Thu, 31 Mar 2011 21:41:28 +0000 Subject: [PATCH] BUGFIX: Fix the build. git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@927 67173fc5-114c-0410-ac8e-9d2fd5bffc1f --- code/Q3BSPFileImporter.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/code/Q3BSPFileImporter.cpp b/code/Q3BSPFileImporter.cpp index 9a0a37a6a..342cae2ab 100644 --- a/code/Q3BSPFileImporter.cpp +++ b/code/Q3BSPFileImporter.cpp @@ -165,7 +165,9 @@ bool Q3BSPFileImporter::CanRead( const std::string& rFile, IOSystem* pIOHandler, { bool isBSPData = false; if ( checkSig ) - isBSPData = SimpleExtensionCheck( rFile, Q3BSPExtention.c_str() ); + { + isBSPData = SimpleExtensionCheck( rFile, Q3BSPExtension .c_str() ); + } return isBSPData; } @@ -174,7 +176,7 @@ bool Q3BSPFileImporter::CanRead( const std::string& rFile, IOSystem* pIOHandler, // Adds extensions. void Q3BSPFileImporter::GetExtensionList( std::set& extensions ) { - extensions.insert( Q3BSPExtention ); + extensions.insert( Q3BSPExtension ); } // ------------------------------------------------------------------------------------------------ @@ -629,6 +631,9 @@ bool Q3BSPFileImporter::importTextureFromArchive( const Q3BSP::Q3BSPModel *pMode Q3BSP::Q3BSPZipArchive *pArchive, aiScene* pScene, Assimp::MaterialHelper *pMatHelper, int textureId ) { + std::vector supportedExtensions; + supportedExtensions.push_back( ".jpg" ); + supportedExtensions.push_back( ".png" ); if ( NULL == pArchive || NULL == pArchive || NULL == pMatHelper ) { return false; @@ -680,7 +685,7 @@ bool Q3BSPFileImporter::importTextureFromArchive( const Q3BSP::Q3BSPModel *pMode } // ------------------------------------------------------------------------------------------------ -// Imports a lightmap file. +// Imports a light map file. bool Q3BSPFileImporter::importLightmap( const Q3BSP::Q3BSPModel *pModel, aiScene* pScene, Assimp::MaterialHelper *pMatHelper, int lightmapId ) {