Merge pull request #6539 from tschw/Texture_JSON_suggestion

Texture JSON suggestion

src/loaders/ObjectLoader.js

@@ -320,7 +320,7 @@ THREE.ObjectLoader.prototype = {
 			for ( var i = 0, l = json.length; i < l; i ++ ) {
 
 				var image = json[ i ];
-				images[ image.uuid ] = loadImage( image.src );
+				images[ image.uuid ] = loadImage( image.url );
 
 			}
 

src/textures/Texture.js

@@ -146,7 +146,7 @@ THREE.Texture.prototype = {
 
 				}
 
-				meta.images[ this.image.uuid ] = { uuid: this.image.uuid, src: src };
+				meta.images[ this.image.uuid ] = { uuid: this.image.uuid, url: src };
 
 			}