Merge pull request #16412 from Kalacione/patch-1

mrdoob · web-flow · commit 5e0bccd61576 · 2019-05-11T11:00:13.000-07:00
GLTFLoader - store original node name
diff --git a/examples/js/loaders/GLTFLoader.js b/examples/js/loaders/GLTFLoader.js
@@ -1299,7 +1299,7 @@ THREE.GLTFLoader = ( function () {
 
 			if ( typeof gltfDef.extras === 'object' ) {
 
-				object.userData = gltfDef.extras;
+				Object.assign( object.userData, gltfDef.extras );
 
 			} else {
 
@@ -2996,6 +2996,7 @@ THREE.GLTFLoader = ( function () {
 
 			if ( nodeDef.name !== undefined ) {
 
+				node.userData.name = nodeDef.name;
 				node.name = THREE.PropertyBinding.sanitizeNodeName( nodeDef.name );
 
 			}

Original file line number	Diff line number	Diff line change
`@@ -1299,7 +1299,7 @@ THREE.GLTFLoader = ( function () {`
`1299`	`1299`
`1300`	`1300`	`if ( typeof gltfDef.extras === 'object' ) {`
`1301`	`1301`
`1302`		`- object.userData = gltfDef.extras;`
	`1302`	`+ Object.assign( object.userData, gltfDef.extras );`
`1303`	`1303`
`1304`	`1304`	`} else {`
`1305`	`1305`
`@@ -2996,6 +2996,7 @@ THREE.GLTFLoader = ( function () {`
`2996`	`2996`
`2997`	`2997`	`if ( nodeDef.name !== undefined ) {`
`2998`	`2998`
	`2999`	`+ node.userData.name = nodeDef.name;`
`2999`	`3000`	`node.name = THREE.PropertyBinding.sanitizeNodeName( nodeDef.name );`
`3000`	`3001`
`3001`	`3002`	`}`