Browse Source

Merge pull request #6796 from tschw/ObjectLoader_texturePath

Let object loader respect its .texturePath property.
Ricardo Cabello 10 years ago
parent
commit
6aa8219868
1 changed files with 3 additions and 1 deletions
  1. 3 1
      src/loaders/ObjectLoader.js

+ 3 - 1
src/loaders/ObjectLoader.js

@@ -190,7 +190,7 @@ THREE.ObjectLoader.prototype = {
 
 					case 'Geometry':
 
-						geometry = geometryLoader.parse( data.data ).geometry;
+						geometry = geometryLoader.parse( data.data, this.texturePath ).geometry;
 
 						break;
 
@@ -307,6 +307,8 @@ THREE.ObjectLoader.prototype = {
 
 			var loadImage = function ( url ) {
 
+				url = scope.texturePath + url;
+
 				scope.manager.itemStart( url );
 
 				return loader.load( url, function () {