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

iObjParser: refactorings.

pull/792/head
Kim Kulling 2016-02-10 10:40:39 +01:00
parent 8681abe845
commit d9017299a8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/ObjFileParser.cpp
View File

@ -775,7 +775,7 @@ void ObjFileParser::createMesh( const std::string &meshName )
// ------------------------------------------------------------------- // -------------------------------------------------------------------
// Returns true, if a new mesh must be created. // Returns true, if a new mesh must be created.
bool ObjFileParser::needsNewMesh( const std::string &rMaterialName ) bool ObjFileParser::needsNewMesh( const std::string &materialName )
{ {
// If no mesh data yet // If no mesh data yet
if(m_pModel->m_pCurrentMesh == 0) if(m_pModel->m_pCurrentMesh == 0)
@ -783,7 +783,7 @@ bool ObjFileParser::needsNewMesh( const std::string &rMaterialName )
return true; return true;
} }
bool newMat = false; bool newMat = false;
int matIdx = getMaterialIndex( rMaterialName ); int matIdx = getMaterialIndex( materialName );
int curMatIdx = m_pModel->m_pCurrentMesh->m_uiMaterialIndex; int curMatIdx = m_pModel->m_pCurrentMesh->m_uiMaterialIndex;
if ( curMatIdx != int(ObjFile::Mesh::NoMaterial) && curMatIdx != matIdx ) if ( curMatIdx != int(ObjFile::Mesh::NoMaterial) && curMatIdx != matIdx )
{ {