Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

a test for bad OBJ file format and code fix that handles it

Browse Source
This commit is contained in:
Vitaly Ovchinnikov
2019-04-26 22:13:29 +12:00
parent 36bce5fa00
commit 42202c2204
2 changed files with 36 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/ObjFileParser.cpp
View File

@@ -429,13 +429,6 @@ void ObjFileParser::getFace( aiPrimitiveType type ) {
if (type == aiPrimitiveType_POINT) {
ASSIMP_LOG_ERROR("Obj: Separator unexpected in point statement");
}
if (iPos == 0) {
//if there are no texture coordinates in the file, but normals
if (!vt && vn) {
iPos = 1;
iStep++;
}
}
iPos++;
} else if( IsSpaceOrNewLine( *m_DataIt ) ) {
iPos = 0;
@@ -452,6 +445,9 @@ void ObjFileParser::getFace( aiPrimitiveType type ) {
++iStep;
}
if (iPos == 1 && !vt && vn)
iPos = 2; // skip texture coords for normals if there are no tex coords
if ( iVal > 0 ) {
// Store parsed index
if ( 0 == iPos ) {