repo: janusweb
action: commit
revision: 
path_from: 
revision_from: ec9b0fa8285f8100b9a20dd55f27d1e363b67549:
path_to: 
revision_to: 

commit ec9b0fa8285f8100b9a20dd55f27d1e363b67549
Author: James Baicoianu 
Date:   Wed Mar 11 00:09:24 2020 -0700

    Fix error when textureasset isn't passed in

diff --git a/scripts/object.js b/scripts/object.js

--- a/scripts/object.js
+++ b/scripts/object.js
@@ -905,7 +905,7 @@ elation.require(['janusweb.janusbase', 'janusweb.websurface'], function() {
       texture.minFilter = (linear && !this.video_id ? THREE.LinearMipMapLinearFilter : THREE.NearestFilter);
       texture.magFilter = (linear ? THREE.LinearFilter : THREE.NearestFilter);
       texture.anisotropy = (linear ? elation.config.get('engine.assets.image.anisotropy', 4) : 1);
-      texture.generateMipmaps = linear && textureasset.detectImageType() != 'basis';
+      texture.generateMipmaps = linear && (textureasset && textureasset.detectImageType() != 'basis');
       texture.offset.copy(this.texture_offset);
       texture.repeat.copy(this.texture_repeat);
       texture.rotation = this.texture_rotation * THREE.Math.DEG2RAD;

-----END OF PAGE-----