aboutsummaryrefslogtreecommitdiff
path: root/js/lib/rdge/materials
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-07-02 09:23:13 -0700
committerNivesh Rajbhandari2012-07-02 09:23:13 -0700
commit2bae1b3148233288ec0bc50876935bdfea1f288c (patch)
tree686fa3b5b9615941bb7013f35c91e8f326b049db /js/lib/rdge/materials
parent2da05a4c71bfe9b136384d9e94fbfbef19f24550 (diff)
parent12de4e49a309e210c13eb40b2ffa158ef2eb54a7 (diff)
downloadninja-2bae1b3148233288ec0bc50876935bdfea1f288c.tar.gz
Merge branch 'refs/heads/ninja-internal' into MaterialsUI
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