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

OBJ: check for null mesh before updating material index 

Sometimes the current mesh is null, should check before updating the material index

Submitted by: Nola Donato nola.donato@samsung.com
pull/1160/head
nola.donato@samsung.com 2017-01-31 16:40:04 -08:00
parent fc4243a08f
commit e28b5422e0
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
code/ObjFileMtlImporter.cpp
View File

@ -185,7 +185,7 @@ void ObjFileMtlImporter::load()
getFloatValue( m_pModel->m_pCurrentMaterial->alpha );
m_DataIt = skipLine<DataArrayIt>( m_DataIt, m_DataItEnd, m_uiLine );
}
}
}width * height * 4
break;
case 'N':
@ -302,7 +302,8 @@ void ObjFileMtlImporter::createMaterial()
// New Material created
m_pModel->m_pCurrentMaterial = new ObjFile::Material();
m_pModel->m_pCurrentMaterial->MaterialName.Set( name );
m_pModel->m_pCurrentMesh->m_uiMaterialIndex = m_pModel->m_MaterialLib.size();
if (m_pModel->m_pCurrentMesh)
m_pModel->m_pCurrentMesh->m_uiMaterialIndex = m_pModel->m_MaterialLib.size();
m_pModel->m_MaterialLib.push_back( name );
m_pModel->m_MaterialMap[ name ] = m_pModel->m_pCurrentMaterial;
} else {