colladaloader now skips over empty data arrays.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@736 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/1/head
aramis_acg 2010-05-25 14:37:28 +00:00
parent 188aa3da37
commit 9d978918d1
1 changed files with 33 additions and 31 deletions

View File

@ -1595,7 +1595,8 @@ void ColladaParser::ReadDataArray()
std::string id = mReader->getAttributeValue( indexID); std::string id = mReader->getAttributeValue( indexID);
int indexCount = GetAttribute( "count"); int indexCount = GetAttribute( "count");
unsigned int count = (unsigned int) mReader->getAttributeValueAsInt( indexCount); unsigned int count = (unsigned int) mReader->getAttributeValueAsInt( indexCount);
const char* content = GetTextContent(); const char* content = TestTextContent();
if (content) { // some exporters write empty data arrays, silently skip over them
// read values and store inside an array in the data library // read values and store inside an array in the data library
mDataLibrary[id] = Data(); mDataLibrary[id] = Data();
@ -1636,6 +1637,7 @@ void ColladaParser::ReadDataArray()
SkipSpacesAndLineEnd( &content); SkipSpacesAndLineEnd( &content);
} }
} }
}
// test for closing tag // test for closing tag
TestClosing( elmName.c_str()); TestClosing( elmName.c_str());