Ver código fonte

Merge pull request #19325 from Mugen87/dev49

ColladaLoader: Use name of instance node instead of library node.
Mr.doob 5 anos atrás
pai
commit
9857dad2bd

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

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

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

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