Browse Source

Merge pull request #12531 from takahirox/FixGLTFLoader

Fix GLTFLoader uncaught exception
Mr.doob 7 years ago
parent
commit
50d805e361
1 changed files with 6 additions and 6 deletions
  1. 6 6
      examples/js/loaders/GLTFLoader.js

+ 6 - 6
examples/js/loaders/GLTFLoader.js

@@ -1025,11 +1025,9 @@ THREE.GLTFLoader = ( function () {
 
 
 				if ( value ) {
 				if ( value ) {
 
 
-					fns.push( value );
-
 					if ( value instanceof Promise ) {
 					if ( value instanceof Promise ) {
 
 
-						value.then( function ( key, value ) {
+						value = value.then( function ( key, value ) {
 
 
 							results[ key ] = value;
 							results[ key ] = value;
 
 
@@ -1041,6 +1039,8 @@ THREE.GLTFLoader = ( function () {
 
 
 					}
 					}
 
 
+					fns.push( value );
+
 				}
 				}
 
 
 			}
 			}
@@ -1057,11 +1057,9 @@ THREE.GLTFLoader = ( function () {
 
 
 					if ( value ) {
 					if ( value ) {
 
 
-						fns.push( value );
-
 						if ( value instanceof Promise ) {
 						if ( value instanceof Promise ) {
 
 
-							value.then( function ( key, value ) {
+							value = value.then( function ( key, value ) {
 
 
 								results[ key ] = value;
 								results[ key ] = value;
 
 
@@ -1073,6 +1071,8 @@ THREE.GLTFLoader = ( function () {
 
 
 						}
 						}
 
 
+						fns.push( value );
+
 					}
 					}
 
 
 				}
 				}