aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
Diffstat (limited to 'js')
-rwxr-xr-xjs/lib/rdge/materials/material.js2
-rw-r--r--js/lib/rdge/materials/pulse-material.js4
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)