2
0
Эх сурвалжийг харах

Merge pull request #13432 from shelbyspeegle/dev

ColladaLoader: instance node names now match their associated library nodes name
Mr.doob 7 жил өмнө
parent
commit
0e44cfd0cd

+ 6 - 1
examples/js/loaders/ColladaLoader.js

@@ -3306,7 +3306,12 @@ THREE.ColladaLoader.prototype = {
 
 			}
 
-			object.name = ( type === 'JOINT' ) ? data.sid : data.name;
+			if ( object.name === '' ) {
+
+				object.name = ( type === 'JOINT' ) ? data.sid : data.name;
+				
+			}
+
 			object.matrix.copy( matrix );
 			object.matrix.decompose( object.position, object.quaternion, object.scale );