repo: janusweb
action: commit
revision: 
path_from: 
revision_from: 430810a845d7959b8925ad81fde0ead3c3596a4e:
path_to: 
revision_to: 

commit 430810a845d7959b8925ad81fde0ead3c3596a4e
Author: James Baicoianu 
Date:   Mon Jan 28 15:14:13 2019 -0800

    Emissive material fix

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

--- a/scripts/object.js
+++ b/scripts/object.js
@@ -598,8 +598,15 @@ elation.require(['janusweb.janusbase', 'janusweb.websurface'], function() {
         m.bumpMap = oldmat.bumpMap;

         if (!(m instanceof THREE.MeshBasicMaterial)) {
-          if (oldmat.emissiveMap) m.emissiveMap = oldmat.emissiveMap;
-          if (oldmat.emissive) m.emissive = oldmat.emissive;
+          if (oldmat.emissiveMap) {
+            m.emissiveMap = oldmat.emissiveMap;
+            m.emissive.setRGB(1,1,1);
+          } else if (oldmat.emissive) {
+            m.emissive = oldmat.emissive;
+          }
+          if (this.emissive) {
+            m.emissive.copy(this.emissive);
+          }
         }

         m.lightMap = oldmat.lightMap;

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