diff --git a/src/loaders/ObjectLoader.js b/src/loaders/ObjectLoader.js index 6e4e9272843664f9f7c9ebf75bc0466a0e7b89d9..d6f289077c83831742e3f728d1f46350f2f7bd26 100644 --- a/src/loaders/ObjectLoader.js +++ b/src/loaders/ObjectLoader.js @@ -48,11 +48,16 @@ THREE.ObjectLoader.prototype = { var geometries = this.parseGeometries( json.geometries ); - var images = this.parseImages( json.images, onLoad ); + var images = this.parseImages( json.images, function () { + + if ( onLoad !== undefined ) onLoad( object ); + + } ); var textures = this.parseTextures( json.textures, images ); var materials = this.parseMaterials( json.materials, textures ); + var object = this.parseObject( json.object, geometries, materials ); - return this.parseObject( json.object, geometries, materials ); + return object; },