repo: janusweb
action: commit
revision: 
path_from: 
revision_from: 1bd3efe471c03aae89e230f887dc5aa651776011:
path_to: 
revision_to: 

commit 1bd3efe471c03aae89e230f887dc5aa651776011
Author: James Baicoianu 
Date:   Thu Oct 22 13:20:04 2020 -0700

    displacementmap_id and envmap_id fall back on video textures

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

--- a/scripts/object.js
+++ b/scripts/object.js
@@ -416,9 +416,9 @@ elation.require(['janusweb.janusbase', 'janusweb.websurface'], function() {
         }
       }
       if (displacement_image_id) {
-        let displacementtextureasset = this.getAsset('image', displacement_image_id, true);
+        let displacementtextureasset = this.getAsset('image', displacement_image_id);
         if (!displacementtextureasset) { // no image found, try video
-          displacementtextureasset = this.getAsset('video', displacement_image_id, true);
+          displacementtextureasset = this.getAsset('video', displacement_image_id);
         }
         if (displacementtextureasset) {
           textureDisplacement = displacementtextureasset.getInstance();
@@ -989,6 +989,10 @@ elation.require(['janusweb.janusbase', 'janusweb.websurface'], function() {
       if (this.envmap_id) {
         if (this.envmap) return this.envmap;
         var envmapasset = this.getAsset('image', this.envmap_id);
+        if (!envmapasset) {
+          // try video as a fallback
+          envmapasset = this.getAsset('video', this.envmap_id);
+        }
         if (envmapasset) {
           this.envmap = envmapasset.getInstance();
           this.envmap.mapping = THREE.EquirectangularReflectionMapping;

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