Browse Source

Merge remote-tracking branch 'AddictArts/dev' into dev

Mr.doob 13 years ago
parent
commit
1e6ed88594
1 changed files with 8 additions and 8 deletions
  1. 8 8
      src/extras/loaders/ColladaLoader.js

+ 8 - 8
src/extras/loaders/ColladaLoader.js

@@ -174,9 +174,9 @@ THREE.ColladaLoader = function () {
 
 		if ( element && element.children ) {
 
-			for ( var i = 0; i < element.children.length; i ++ ) {
+			for ( var i = 0; i < element.childNodes.length; i ++ ) {
 
-				var child = element.children[ i ];
+				var child = element.childNodes[ i ];
 
 				switch ( child.nodeName ) {
 
@@ -2727,21 +2727,21 @@ THREE.ColladaLoader = function () {
 
 		// This should be supported by Maya, 3dsMax, and MotionBuilder
 
-		if ( element.children[0] && element.children[0].nodeName === 'extra' ) {
+		if ( element.childNodes[1] && element.childNodes[1].nodeName === 'extra' ) {
 
-			element = element.children[0];
+			element = element.childNodes[1];
 
-			if ( element.children[0] && element.children[0].nodeName === 'technique' ) {
+			if ( element.childNodes[1] && element.childNodes[1].nodeName === 'technique' ) {
 
-				element = element.children[0];
+				element = element.childNodes[1];
 
 			}
 
 		}
 
-		for ( var i = 0; i < element.children.length; i ++ ) {
+		for ( var i = 0; i < element.childNodes.length; i ++ ) {
 
-			var child = element.children[ i ];
+			var child = element.childNodes[ i ];
 
 			switch ( child.nodeName ) {