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

[3053648] Obj: segfault when first line is a material. 

Add test file to reproduce the issues. Thanks to Ingo Kresse for providing the patch.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@807 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/1/head
aramis_acg 2010-08-27 12:36:02 +00:00
parent c5c5338397
commit cab35c496d
4 changed files with 2515 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
code/ObjFileParser.cpp
View File

@ -633,6 +633,11 @@ void ObjFileParser::createMesh()
// 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 &rMaterialName )
{ {
if(m_pModel->m_pCurrentMesh == 0)
{
// No mesh data yet
return true;
}
bool newMat = false; bool newMat = false;
int matIdx = getMaterialIndex( rMaterialName ); int matIdx = getMaterialIndex( rMaterialName );
int curMatIdx = m_pModel->m_pCurrentMesh->m_uiMaterialIndex; int curMatIdx = m_pModel->m_pCurrentMesh->m_uiMaterialIndex;

22
test/models/OBJ/segment.mtl 100644
View File

@ -0,0 +1,22 @@
# Blender3D MTL File:
# Material Count: 2
newmtl Orange
Ns 96.078431
Ka 0.000000 0.000000 0.000000
Kd 0.739482 0.420173 0.148173
Ks 0.500000 0.500000 0.500000
Ni 1.000000
d 1.000000
illum 2
newmtl Silver
Ns 96.078431
Ka 0.000000 0.000000 0.000000
Kd 0.480000 0.480000 0.480000
Ks 0.500000 0.500000 0.500000
Ni 1.000000
d 1.000000
illum 2

2484
test/models/OBJ/segment.obj 100644
View File

File diff suppressed because it is too large Load Diff

4
test/models/OBJ/segment.source.txt 100644
View File

@ -0,0 +1,4 @@
Obj exported from Blender
http://toychest.in.tum.de/wiki/projects:kuka_lwr
License: Creative-Commons-by-Attribution-3.0