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/rdge/materials/material.js | |
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/rdge/materials/material.js')
-rwxr-xr-x | js/lib/rdge/materials/material.js | 2 |
1 files changed, 1 insertions, 1 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 | ||