colladaloader now skips over empty data arrays.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@736 67173fc5-114c-0410-ac8e-9d2fd5bffc1f

code/ColladaParser.cpp

@@ -1595,45 +1595,47 @@ void ColladaParser::ReadDataArray()
 	std::string id = mReader->getAttributeValue( indexID);
 	int indexCount = GetAttribute( "count");
 	unsigned int count = (unsigned int) mReader->getAttributeValueAsInt( indexCount);
-	const char* content = GetTextContent();
-
-	// read values and store inside an array in the data library
-	mDataLibrary[id] = Data();
-	Data& data = mDataLibrary[id];
-	data.mIsStringArray = isStringArray;
+	const char* content = TestTextContent();
+	if (content) { // some exporters write empty data arrays, silently skip over them
 
-	if( isStringArray)
-	{
-		data.mStrings.reserve( count);
-		std::string s;
+		// read values and store inside an array in the data library
+		mDataLibrary[id] = Data();
+		Data& data = mDataLibrary[id];
+		data.mIsStringArray = isStringArray;
 
-		for( unsigned int a = 0; a < count; a++)
+		if( isStringArray)
 		{
-			if( *content == 0)
-				ThrowException( "Expected more values while reading IDREF_array contents.");
+			data.mStrings.reserve( count);
+			std::string s;
 
-			s.clear();
-			while( !IsSpaceOrNewLine( *content))
-				s += *content++;
-			data.mStrings.push_back( s);
+			for( unsigned int a = 0; a < count; a++)
+			{
+				if( *content == 0)
+					ThrowException( "Expected more values while reading IDREF_array contents.");
 
-			SkipSpacesAndLineEnd( &content);
-		}
-	} else
-	{
-		data.mValues.reserve( count);
+				s.clear();
+				while( !IsSpaceOrNewLine( *content))
+					s += *content++;
+				data.mStrings.push_back( s);
 
-		for( unsigned int a = 0; a < count; a++)
+				SkipSpacesAndLineEnd( &content);
+			}
+		} else
 		{
-			if( *content == 0)
-				ThrowException( "Expected more values while reading float_array contents.");
-
-			float value;
-			// read a number
-			content = fast_atof_move( content, value);
-			data.mValues.push_back( value);
-			// skip whitespace after it
-			SkipSpacesAndLineEnd( &content);
+			data.mValues.reserve( count);
+
+			for( unsigned int a = 0; a < count; a++)
+			{
+				if( *content == 0)
+					ThrowException( "Expected more values while reading float_array contents.");
+
+				float value;
+				// read a number
+				content = fast_atof_move( content, value);
+				data.mValues.push_back( value);
+				// skip whitespace after it
+				SkipSpacesAndLineEnd( &content);
+			}
 		}
 	}