aboutsummaryrefslogtreecommitdiff
path: root/js/lib/rdge/materials
diff options
context:
space:
mode:
authorArmen Kesablyan2012-07-02 13:20:43 -0700
committerArmen Kesablyan2012-07-02 13:20:43 -0700
commit5a6b1fcf207817a7aa0ba7d0c1bea90f0ee5e8cb (patch)
treeaf71b72b828d942ebf11f565b7c9ccff0798343d /js/lib/rdge/materials
parent8966fc4903f0eec61816d9b9bdbcac9b7d99c320 (diff)
parent526b9d76686323f488f1b26175440172b715d808 (diff)
downloadninja-5a6b1fcf207817a7aa0ba7d0c1bea90f0ee5e8cb.tar.gz
Merge branch 'refs/heads/master' into GIO-TextTool
Diffstat (limited to 'js/lib/rdge/materials')
-rwxr-xr-xjs/lib/rdge/materials/uber-material.js12
1 files changed, 12 insertions, 0 deletions
diff --git a/js/lib/rdge/materials/uber-material.js b/js/lib/rdge/materials/uber-material.js
index 347e45d3..e1c6781d 100755
--- a/js/lib/rdge/materials/uber-material.js
+++ b/js/lib/rdge/materials/uber-material.js
@@ -99,6 +99,18 @@ var UberMaterial = function UberMaterial() {
99 } 99 }
100 } 100 }
101 }; 101 };
102
103 this.hasProperty = function( prop )
104 {
105 if(prop === "color") return true;
106
107 var propNames = [], dummy = [];
108 this.getAllProperties( propNames, dummy, dummy, dummy )
109 for (var i=0; i<propNames.length; i++)
110 {
111 if (prop === propNames[i]) return true;
112 }
113 };
102 /////////////////////////////////////////////////////////////////////// 114 ///////////////////////////////////////////////////////////////////////
103 115
104 // define the 4 lights 116 // define the 4 lights