From d23430c4bdc740e6682e7efc793b80f10a3040e6 Mon Sep 17 00:00:00 2001
From: Sherief Farouk <sherief@Sheriefs-MacBook-Pro.local>
Date: Thu, 15 Aug 2013 00:21:00 -0400
Subject: [PATCH] Collada mesh name is copied from id only if there was no name
 attribute in the <geometry> node.

---
 code/ColladaLoader.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/ColladaLoader.cpp b/code/ColladaLoader.cpp
index c40d3b8f2..7e4704b8f 100644
--- 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;
+                }
       }
 		}
 	}