From 66c4226d812afc86db3790bae002d3d646049aca Mon Sep 17 00:00:00 2001 From: "Mr.doob" Date: Wed, 15 Oct 2014 04:36:14 +0200 Subject: [PATCH] Fixed ColladaLoader. It was misusing overwrite Object3D.id :( --- examples/js/loaders/ColladaLoader.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/js/loaders/ColladaLoader.js b/examples/js/loaders/ColladaLoader.js index c9e579777c..b82ad018ac 100644 --- a/examples/js/loaders/ColladaLoader.js +++ b/examples/js/loaders/ColladaLoader.js @@ -315,7 +315,7 @@ THREE.ColladaLoader = function () { function recurseHierarchy( node ) { - var n = visualScene.getChildById( node.id, true ), + var n = visualScene.getChildById( node.colladaId, true ), newData = null; if ( n && n.keys ) { @@ -838,7 +838,7 @@ THREE.ColladaLoader = function () { scene.traverse(function( node ) { - if ( node.id == parentVisualElementId ) { + if ( node.colladaId == parentVisualElementId ) { jointMap[ jointIndex ] = { node: node, @@ -1300,7 +1300,7 @@ THREE.ColladaLoader = function () { } obj.name = node.name || node.id || ""; - obj.id = node.id || ""; + obj.colladaId = node.id || ""; obj.layer = node.layer || ""; obj.matrix = node.matrix; obj.matrix.decompose( obj.position, obj.quaternion, obj.scale ); -- GitLab