diff options
author | Armen Kesablyan | 2012-07-02 13:19:20 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-07-02 13:19:20 -0700 |
commit | 526b9d76686323f488f1b26175440172b715d808 (patch) | |
tree | 47fc6bd90715b403a08d08a48a86f4d24da1ba29 /js/lib | |
parent | b194664df7e01aaeb8d1e7220a6de0e7f879f1db (diff) | |
parent | 12de4e49a309e210c13eb40b2ffa158ef2eb54a7 (diff) | |
download | ninja-526b9d76686323f488f1b26175440172b715d808.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Diffstat (limited to 'js/lib')
-rwxr-xr-x | js/lib/rdge/materials/uber-material.js | 12 |
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 |