repo: janusweb
action: commit
revision: 
path_from: 
revision_from: 2178dd23d5fd9e17cee3bfa3a1661b37e6bff9be:
path_to: 
revision_to: 

commit 2178dd23d5fd9e17cee3bfa3a1661b37e6bff9be
Author: James Baicoianu 
Date:   Sun Oct 16 19:47:15 2016 -0700

    Don't replace object color unless color property has been explicitly set

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

--- a/scripts/object.js
+++ b/scripts/object.js
@@ -160,7 +160,9 @@ elation.require(['janusweb.janusbase'], function() {
           this.videotexture = texture;
         }
       }
-      color = this.properties.color;
+      if (this.properties.color !== this.defaultcolor) {
+        color = this.properties.color;
+      }
 /*
       if (this.properties.col) {
         var col = this.properties.col;

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