Collada mesh name is copied from id only if there was no name attribute in the <geometry> node.

2013-08-15 00:21:00 -04:00
parent 57e34cc90a
commit d23430c4bd
1 changed files with 4 additions and 1 deletions
--- a/code/ColladaLoader.cpp
+++ b/code/ColladaLoader.cpp
@@ -521,7 +521,10 @@ void ColladaLoader::BuildMeshesForNode( const ColladaParser& pParser, const Coll

 				// assign the material index
 				dstMesh->mMaterialIndex = matIdx;
-        dstMesh->mName = mid.mMeshOrController;			
+                if(dstMesh->mName.length == 0)
+                {
+                    dstMesh->mName = mid.mMeshOrController;
+                }
      }
 		}
 	}