Browse Source

ObjectLoader: Fixed empty images. See fcf54cd2ed3b9097126c3f6b4fc5764a07f5195e.

Mr.doob 10 years ago
parent
commit
6f9491163d
1 changed files with 5 additions and 7 deletions
  1. 5 7
      src/loaders/ObjectLoader.js

+ 5 - 7
src/loaders/ObjectLoader.js

@@ -289,25 +289,23 @@ THREE.ObjectLoader.prototype = {
 			var loader = new THREE.ImageLoader( manager );
 			var loader = new THREE.ImageLoader( manager );
 			loader.setCrossOrigin( this.crossOrigin );
 			loader.setCrossOrigin( this.crossOrigin );
 
 
-			var loadImage = function ( data ) {
-
-				var url = scope.texturePath + data.url;
+			var loadImage = function ( url ) {
 
 
 				scope.manager.itemStart( url );
 				scope.manager.itemStart( url );
 
 
-				loader.load( url, function ( image ) {
+				return loader.load( url, function () {
 
 
 					scope.manager.itemEnd( url );
 					scope.manager.itemEnd( url );
 
 
-					images[ data.uuid ] = image;
-
 				} );
 				} );
 
 
 			};
 			};
 
 
 			for ( var i = 0, l = json.length; i < l; i ++ ) {
 			for ( var i = 0, l = json.length; i < l; i ++ ) {
 
 
-				loadImage( json[ i ] );
+				var image = json[ i ];
+
+				images[ image.uuid ] = loadImage( scope.texturePath + image.url );
 
 
 			}
 			}