Merge branch 'master' of git://github.com/assimp/assimp

2012-12-21 16:24:05 +01:00
parent c1cd88e9de 84939d5aec
commit bae9db2f03
179 changed files with 20711 additions and 7693 deletions
--- a/code/ColladaLoader.cpp
+++ b/code/ColladaLoader.cpp
@@ -514,7 +514,8 @@ void ColladaLoader::BuildMeshesForNode( const ColladaParser& pParser, const Coll

 				// assign the material index
 				dstMesh->mMaterialIndex = matIdx;
-			}
+        dstMesh->mName = mid.mMeshOrController;			
+      }
 		}
 	}