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

BUGFIX: Fix the build. 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@927 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/1/head
kimmi 2011-03-31 21:41:28 +00:00
parent 04894d35d2
commit 932d163d21
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
code/Q3BSPFileImporter.cpp
View File

@ -165,7 +165,9 @@ bool Q3BSPFileImporter::CanRead( const std::string& rFile, IOSystem* pIOHandler,
{ {
bool isBSPData = false; bool isBSPData = false;
if ( checkSig ) if ( checkSig )
isBSPData = SimpleExtensionCheck( rFile, Q3BSPExtention.c_str() ); {
isBSPData = SimpleExtensionCheck( rFile, Q3BSPExtension .c_str() );
}
return isBSPData; return isBSPData;
} }
@ -174,7 +176,7 @@ bool Q3BSPFileImporter::CanRead( const std::string& rFile, IOSystem* pIOHandler,
// Adds extensions. // Adds extensions.
void Q3BSPFileImporter::GetExtensionList( std::set<std::string>& extensions ) void Q3BSPFileImporter::GetExtensionList( std::set<std::string>& extensions )
{ {
extensions.insert( Q3BSPExtention ); extensions.insert( Q3BSPExtension );
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
@ -629,6 +631,9 @@ bool Q3BSPFileImporter::importTextureFromArchive( const Q3BSP::Q3BSPModel *pMode
Q3BSP::Q3BSPZipArchive *pArchive, aiScene* pScene, Q3BSP::Q3BSPZipArchive *pArchive, aiScene* pScene,
Assimp::MaterialHelper *pMatHelper, int textureId ) Assimp::MaterialHelper *pMatHelper, int textureId )
{ {
std::vector<std::string> supportedExtensions;
supportedExtensions.push_back( ".jpg" );
supportedExtensions.push_back( ".png" );
if ( NULL == pArchive || NULL == pArchive || NULL == pMatHelper ) if ( NULL == pArchive || NULL == pArchive || NULL == pMatHelper )
{ {
return false; 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, bool Q3BSPFileImporter::importLightmap( const Q3BSP::Q3BSPModel *pModel, aiScene* pScene,
Assimp::MaterialHelper *pMatHelper, int lightmapId ) Assimp::MaterialHelper *pMatHelper, int lightmapId )
{ {