diff options
author | hwc487 | 2012-06-04 11:35:17 -0700 |
---|---|---|
committer | hwc487 | 2012-06-04 11:35:17 -0700 |
commit | f0bbd7688bcf2c6b8f749c7c6061ac09640ab08c (patch) | |
tree | 9100d3d30bec004375b0316eb59da3a716a19fdd /js/lib | |
parent | 468b20e7fbc27882f8a37c83afd86d1d06c52afd (diff) | |
download | ninja-f0bbd7688bcf2c6b8f749c7c6061ac09640ab08c.tar.gz |
Avoid throwing shader errors in the console for 'color' property at a base class level.
Diffstat (limited to 'js/lib')
-rwxr-xr-x | js/lib/rdge/materials/material.js | 2 | ||||
-rw-r--r-- | js/lib/rdge/materials/pulse-material.js | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/js/lib/rdge/materials/material.js b/js/lib/rdge/materials/material.js index b9de9988..856513e2 100755 --- a/js/lib/rdge/materials/material.js +++ b/js/lib/rdge/materials/material.js | |||
@@ -210,7 +210,7 @@ var Material = function GLMaterial( world ) { | |||
210 | console.log( "setting invalid material property: " + prop + ", value: " + value ); | 210 | console.log( "setting invalid material property: " + prop + ", value: " + value ); |
211 | } | 211 | } |
212 | 212 | ||
213 | if (!rtnVal) { | 213 | if (!rtnVal && (prop != 'color')) { |
214 | console.log( "invalid material property: " + prop + " : " + value ); | 214 | console.log( "invalid material property: " + prop + " : " + value ); |
215 | } | 215 | } |
216 | 216 | ||
diff --git a/js/lib/rdge/materials/pulse-material.js b/js/lib/rdge/materials/pulse-material.js index 28f3ee5e..374a5eae 100644 --- a/js/lib/rdge/materials/pulse-material.js +++ b/js/lib/rdge/materials/pulse-material.js | |||
@@ -61,8 +61,8 @@ var PulseMaterial = function PulseMaterial() | |||
61 | this.setProperty = function( prop, value ) { | 61 | this.setProperty = function( prop, value ) { |
62 | // make sure we have legitimate imput | 62 | // make sure we have legitimate imput |
63 | var ok = this.validateProperty( prop, value ); | 63 | var ok = this.validateProperty( prop, value ); |
64 | if (!ok) { | 64 | if (!ok && (prop != 'color')) { |
65 | console.log( "invalid property in Radial Gradient Material:" + prop + " : " + value ); | 65 | console.log( "invalid property in Material:" + prop + " : " + value ); |
66 | } | 66 | } |
67 | 67 | ||
68 | switch (prop) | 68 | switch (prop) |