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

commit ddcf437e04a560f34ce75c4c651c9e9649b96d86
Author: James Baicoianu 
Date:   Sun Oct 31 01:46:32 2021 -0700

    Gracefully handle null default value for colors

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

--- a/scripts/janusbase.js
+++ b/scripts/janusbase.js
@@ -287,7 +287,7 @@ elation.require(['engine.things.generic', 'utils.template', 'janusweb.parts'], f
             }
           } else if (val instanceof THREE.Color) {
             if (defaultval instanceof THREE.Color) defaultval = defaultval.toArray();
-            if (!('default' in propdef) || ('default' in propdef && !(val.r == defaultval[0] && val.g == defaultval[1] && val.b == defaultval[2]))) {
+            if (!('default' in propdef) || defaultval === null || ('default' in propdef && !(val.r == defaultval[0] && val.g == defaultval[1] && val.b == defaultval[2]))) {
               attrs[k] = val.toArray().map(n => Math.round(n * 10000) / 10000).join(' ');
             }
           } else if (val instanceof THREE.Euler) {

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