aboutsummaryrefslogtreecommitdiff
path: root/js/lib
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-29 15:53:27 -0700
committerJose Antonio Marquez2012-06-29 15:53:27 -0700
commit4fa5952454926c069a55f6a8da277ccfa8d53c75 (patch)
treecffe315dde57da0901d3af5be93a510093e04dc7 /js/lib
parentdeadb791e6afc9cc4e81a0d9c6a0b52f0c6d1372 (diff)
parentec69c8761f798eaf39c4a154997f8bc54b7e47f4 (diff)
downloadninja-4fa5952454926c069a55f6a8da277ccfa8d53c75.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'js/lib')
-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