home/three.js
2
0
Fork 0
mirror of https://github.com/wahyd4/three.js.git synced 2026-08-09 04:56:01 +10:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mr.doob
2011-11-21 06:10:56 +01:00
parent 655b1efbde ef56fd9b79
commit 1e6ed88594
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/extras/loaders/ColladaLoader.js
+8 -8
View File
@@ -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 ) {