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

- Bugfix: fixed Collada parser to accept empty data elements again

Browse Source 
- Workaround: added a little extra code to handle texture filenames of Maxon Cinema Collada Exporter 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1231 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
This commit is contained in:
ulfjorensen
2012-04-02 10:43:18 +00:00
parent 07841c3e13
commit 5975f3eff2
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/ColladaParser.cpp
View File

@@ -1695,10 +1695,10 @@ void ColladaParser::ReadDataArray()
SkipSpacesAndLineEnd( &content);
}
}
}
// test for closing tag
TestClosing( elmName.c_str());
// test for closing tag
TestClosing( elmName.c_str());
}
}
// ------------------------------------------------------------------------------------------------
@@ -2705,11 +2705,11 @@ const char* ColladaParser::TestTextContent()
{
// present node should be the beginning of an element
if( mReader->getNodeType() != irr::io::EXN_ELEMENT || mReader->isEmptyElement())
ThrowException( "Expected opening element");
return NULL;
// read contents of the element
if( !mReader->read())
ThrowException( "Unexpected end of file while reading n element.");
if( !mReader->read() )
return NULL;
if( mReader->getNodeType() != irr::io::EXN_TEXT)
return NULL;