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

Merge pull request #1397 from Arshia001/master 

Fix OBJ discarding all material names if the material library is missing
pull/1398/head
Kim Kulling 2017-08-18 23:54:41 +02:00 committed by GitHub
parent 6b4e3177e8 e0fc412e57
commit a71a61f260
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
code/ObjFileParser.cpp
View File

@ -555,10 +555,15 @@ void ObjFileParser::getMaterialDesc() {
// Search for material // Search for material
std::map<std::string, ObjFile::Material*>::iterator it = m_pModel->m_MaterialMap.find(strName); std::map<std::string, ObjFile::Material*>::iterator it = m_pModel->m_MaterialMap.find(strName);
if (it == m_pModel->m_MaterialMap.end()) { if (it == m_pModel->m_MaterialMap.end()) {
// Not found, use default material // Not found, so we don't know anything about the material except for its name.
m_pModel->m_pCurrentMaterial = m_pModel->m_pDefaultMaterial; // This may be the case if the material library is missing. We don't want to lose all
DefaultLogger::get()->error("OBJ: failed to locate material " + strName + ", skipping"); // materials if that happens, so create a new named material instead of discarding it
strName = m_pModel->m_pDefaultMaterial->MaterialName.C_Str(); // completely.
DefaultLogger::get()->error("OBJ: failed to locate material " + strName + ", creating new material");
m_pModel->m_pCurrentMaterial = new ObjFile::Material();
m_pModel->m_pCurrentMaterial->MaterialName.Set(strName);
m_pModel->m_MaterialLib.push_back(strName);
m_pModel->m_MaterialMap[strName] = m_pModel->m_pCurrentMaterial;
} else { } else {
// Found, using detected material // Found, using detected material
m_pModel->m_pCurrentMaterial = (*it).second; m_pModel->m_pCurrentMaterial = (*it).second;