aboutsummaryrefslogtreecommitdiff
path: root/js/lib/rdge/materials/material.js
diff options
context:
space:
mode:
authorhwc4872012-06-04 11:35:17 -0700
committerhwc4872012-06-04 11:35:17 -0700
commitf0bbd7688bcf2c6b8f749c7c6061ac09640ab08c (patch)
tree9100d3d30bec004375b0316eb59da3a716a19fdd /js/lib/rdge/materials/material.js
parent468b20e7fbc27882f8a37c83afd86d1d06c52afd (diff)
downloadninja-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-xjs/lib/rdge/materials/material.js2
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