Merge branch 'refs/heads/ninja-internal' into MaterialsUI

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() {
             }
         }
     };
+
+    this.hasProperty = function( prop )
+    {
+        if(prop === "color") return true;
+
+        var propNames = [],  dummy = [];
+        this.getAllProperties( propNames, dummy, dummy, dummy )
+        for (var i=0;  i<propNames.length;  i++)
+        {
+            if (prop === propNames[i])  return true;
+        }
+    };
     ///////////////////////////////////////////////////////////////////////
 
     // define the 4 lights