Updated builds.

mrdoob · mrdoob · commit bd8c3604c0ee · 2015-09-15T23:38:13.000+02:00
diff --git a/build/three.js b/build/three.js
@@ -14238,31 +14238,31 @@ THREE.ObjectLoader.prototype = {
 		var scope = this;
 		var images = {};
 
-		if ( json !== undefined && json.length > 0 ) {
+		function loadImage( url ) {
 
-			var manager = new THREE.LoadingManager( onLoad );
+			scope.manager.itemStart( url );
 
-			var loader = new THREE.ImageLoader( manager );
-			loader.setCrossOrigin( this.crossOrigin );
+			return loader.load( url, function () {
 
-			var loadImage = function ( url ) {
+				scope.manager.itemEnd( url );
 
-				url = scope.texturePath + url;
-
-				scope.manager.itemStart( url );
+			} );
 
-				return loader.load( url, function () {
+		}
 
-					scope.manager.itemEnd( url );
+		if ( json !== undefined && json.length > 0 ) {
 
-				} );
+			var manager = new THREE.LoadingManager( onLoad );
 
-			};
+			var loader = new THREE.ImageLoader( manager );
+			loader.setCrossOrigin( this.crossOrigin );
 
 			for ( var i = 0, l = json.length; i < l; i ++ ) {
 
 				var image = json[ i ];
-				images[ image.uuid ] = loadImage( image.url );
+				var path = /^(\/\/)|([a-z]+:(\/\/)?)/i.test( image.url ) ? image.url : scope.texturePath + image.url;
+
+				images[ image.uuid ] = loadImage( path );
 
 			}
 
diff --git a/build/three.min.js b/build/three.min.js
diff --git a/src/loaders/ObjectLoader.js b/src/loaders/ObjectLoader.js
@@ -321,24 +321,24 @@ THREE.ObjectLoader.prototype = {
 		var scope = this;
 		var images = {};
 
-		if ( json !== undefined && json.length > 0 ) {
+		function loadImage( url ) {
 
-			var manager = new THREE.LoadingManager( onLoad );
+			scope.manager.itemStart( url );
 
-			var loader = new THREE.ImageLoader( manager );
-			loader.setCrossOrigin( this.crossOrigin );
+			return loader.load( url, function () {
 
-			function loadImage( url ) {
+				scope.manager.itemEnd( url );
 
-				scope.manager.itemStart( url );
+			} );
 
-				return loader.load( url, function () {
+		}
 
-					scope.manager.itemEnd( url );
+		if ( json !== undefined && json.length > 0 ) {
 
-				} );
+			var manager = new THREE.LoadingManager( onLoad );
 
-			}
+			var loader = new THREE.ImageLoader( manager );
+			loader.setCrossOrigin( this.crossOrigin );
 
 			for ( var i = 0, l = json.length; i < l; i ++ ) {
 
