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

Merge pull request #763 from andrewparlane/mtlFix 

ObjFileMtlImporter: Fixed a segfault due to NULL ptr access.
pull/765/head
Kim Kulling 2016-01-23 19:51:49 +01:00
parent a3a42fd08b 3c4e06c23f
commit 0e4cf64a45
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
code/ObjFileMtlImporter.cpp
View File

@ -339,6 +339,7 @@ void ObjFileMtlImporter::getTexture() {
} else if(!ASSIMP_strincmp( pPtr, ReflectionTexture.c_str(), ReflectionTexture.size() ) ) { } else if(!ASSIMP_strincmp( pPtr, ReflectionTexture.c_str(), ReflectionTexture.size() ) ) {
// Reflection texture(s) // Reflection texture(s)
//Do nothing here //Do nothing here
return;
} else if (!ASSIMP_strincmp( pPtr, DisplacementTexture.c_str(), DisplacementTexture.size() ) ) { } else if (!ASSIMP_strincmp( pPtr, DisplacementTexture.c_str(), DisplacementTexture.size() ) ) {
// Displacement texture // Displacement texture
out = &m_pModel->m_pCurrentMaterial->textureDisp; out = &m_pModel->m_pCurrentMaterial->textureDisp;