diff options
author | hwc487 | 2012-06-14 13:55:32 -0700 |
---|---|---|
committer | hwc487 | 2012-06-14 13:55:32 -0700 |
commit | bcb0266bb6f9a578d033ad5b7b9869074e4f98a1 (patch) | |
tree | b66210f852aa924f890f9c2b2925a6a36553ff5b /js/lib/rdge/materials/material.js | |
parent | bcd7ce86e2fb71ebc1420ea5967770ce70d9faa2 (diff) | |
download | ninja-bcb0266bb6f9a578d033ad5b7b9869074e4f98a1.tar.gz |
Fixed alphabetization of material names.
Removed console output.
Removed texture map field from Mandel material editor.
Diffstat (limited to 'js/lib/rdge/materials/material.js')
-rwxr-xr-x | js/lib/rdge/materials/material.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/js/lib/rdge/materials/material.js b/js/lib/rdge/materials/material.js index 34529e6b..65448c0c 100755 --- a/js/lib/rdge/materials/material.js +++ b/js/lib/rdge/materials/material.js | |||
@@ -220,9 +220,9 @@ var Material = function GLMaterial( world ) { | |||
220 | console.log( "setting invalid material property: " + prop + ", value: " + value ); | 220 | console.log( "setting invalid material property: " + prop + ", value: " + value ); |
221 | } | 221 | } |
222 | 222 | ||
223 | if (!rtnVal && (prop != 'color')) { | 223 | // if (!rtnVal && (prop != 'color')) { |
224 | console.log( "invalid material property: " + prop + " : " + value ); | 224 | // console.log( "invalid material property: " + prop + " : " + value ); |
225 | } | 225 | // } |
226 | 226 | ||
227 | return rtnVal; | 227 | return rtnVal; |
228 | }; | 228 | }; |
@@ -231,7 +231,7 @@ var Material = function GLMaterial( world ) { | |||
231 | { | 231 | { |
232 | var ok = this.validateProperty( prop, value ); | 232 | var ok = this.validateProperty( prop, value ); |
233 | if (!ok && (prop != 'color')) { | 233 | if (!ok && (prop != 'color')) { |
234 | console.log( "invalid property in Material:" + prop + " : " + value ); | 234 | //console.log( "invalid property in Material:" + prop + " : " + value ); |
235 | return; | 235 | return; |
236 | } | 236 | } |
237 | 237 | ||