FIX: ColladaLoader now ignores missing 'meter' attribute in Collada files produced by C4D. Adding a c4ddae test file. Thanks to Tobias Rittig to point it out.

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

CREDITS

@@ -64,3 +64,6 @@ Contributed several bugfixes fixing memory leaks and improving float parsing
 
 - sueastside
 Updated PyAssimp to the latest Assimp data structures and provided a script to keep the Python binding up-to-date.
+
+- Tobias Rittig
+Collada testing with Cinema 4D

code/ColladaParser.cpp

@@ -202,8 +202,13 @@ void ColladaParser::ReadAssetInfo()
 			if( IsElement( "unit"))
 			{
 				// read unit data from the element's attributes
-				int attrIndex = GetAttribute( "meter");
-				mUnitSize = mReader->getAttributeValueAsFloat( attrIndex);
+				const int attrIndex = TestAttribute( "meter");
+				if (attrIndex == -1) {
+					mUnitSize = 1.f;
+				}
+				else {
+					mUnitSize = mReader->getAttributeValueAsFloat( attrIndex);
+				}
 
 				// consume the trailing stuff
 				if( !mReader->isEmptyElement())