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

commit b020ad69fadf439cac19e998479351b658f9ab7f
Author: James Baicoianu 
Date:   Wed Sep 19 02:06:01 2018 -0700

    Use this.opacity if old material doesn't specify

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

--- a/scripts/object.js
+++ b/scripts/object.js
@@ -468,7 +468,7 @@ elation.require(['janusweb.janusbase', 'janusweb.websurface'], function() {
         m.anisotropy = 16;
         m.name = oldmat.name;
         m.map = oldmat.map;
-        m.opacity = parseFloat(oldmat.opacity); //(typeof oldmat.opacity != 'undefined' ? parseFloat(oldmat.opacity) : this.opacity);
+        m.opacity = (typeof oldmat.opacity != 'undefined' ? parseFloat(oldmat.opacity) : this.opacity);
         m.alphaTest = this.alphatest;
         m.aoMap = oldmat.aoMap;
         m.normalMap = oldmat.normalMap;

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