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

commit e4f1c0fb7680cb842bb444243455c80ccc04c9e7
Author: James Baicoianu 
Date:   Sun Jan 22 00:33:46 2017 -0800

    Fix scoping problem, revert to non-PBR materials for now

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

--- a/scripts/object.js
+++ b/scripts/object.js
@@ -182,7 +182,8 @@ elation.require(['janusweb.janusbase', 'janusweb.websurface'], function() {
           color = false,
           blend_src = false,
           blend_dest = false,
-          side = this.sidemap[this.properties.cull_face];
+          side = this.sidemap[this.properties.cull_face],
+          textureasset;

       this.textureNeedsUpdate = false;

@@ -327,7 +328,7 @@ elation.require(['janusweb.janusbase', 'janusweb.websurface'], function() {
         }
         var m = new THREE.MultiMaterial(materials);
       } else {
-        var m = (this.properties.lighting != false ? new THREE.MeshPhysicalMaterial() : new THREE.MeshBasicMaterial());
+        var m = (this.properties.lighting != false ? new THREE.MeshPhongMaterial() : new THREE.MeshBasicMaterial());
         //var m = new THREE.MeshBasicMaterial();
         m.anisotropy = 16;
         m.name = oldmat.name;

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