|
@@ -1086,10 +1086,6 @@ Texture.prototype = {
|
|
|
this.unpackAlignment = source.unpackAlignment;
|
|
|
this.encoding = source.encoding;
|
|
|
|
|
|
- // TODO (abelnation): this was added as something causes texture constants to be "copied" before they are properly uploaded to GPU
|
|
|
- this.needsUpdate = source.needsUpdate;
|
|
|
- this.version = source.version;
|
|
|
-
|
|
|
return this;
|
|
|
|
|
|
},
|
|
@@ -32808,7 +32804,7 @@ Object.assign( JSONLoader.prototype, {
|
|
|
* @author mrdoob / http://mrdoob.com/
|
|
|
*/
|
|
|
|
|
|
-function ObjectLoader ( manager ) {
|
|
|
+function ObjectLoader( manager ) {
|
|
|
|
|
|
this.manager = ( manager !== undefined ) ? manager : DefaultLoadingManager;
|
|
|
this.texturePath = '';
|
|
@@ -32880,7 +32876,7 @@ Object.assign( ObjectLoader.prototype, {
|
|
|
|
|
|
} );
|
|
|
|
|
|
- var textures = this.parseTextures( json.textures, images );
|
|
|
+ var textures = this.parseTextures( json.textures, images );
|
|
|
var materials = this.parseMaterials( json.materials, textures );
|
|
|
|
|
|
var object = this.parseObject( json.object, geometries, materials );
|