diff options
author | hwc487 | 2012-06-14 16:09:31 -0700 |
---|---|---|
committer | hwc487 | 2012-06-14 16:09:31 -0700 |
commit | f0fc7a5678093cce986bd99fef2c5c88add19b68 (patch) | |
tree | b82ab65fe4df3514c90cf9ce5ca57d0197181078 /js/panels/Materials/materials-popup.reel/materials-popup.js | |
parent | bcb0266bb6f9a578d033ad5b7b9869074e4f98a1 (diff) | |
download | ninja-f0fc7a5678093cce986bd99fef2c5c88add19b68.tar.gz |
Fix for line color.
Name change for all materials
Diffstat (limited to 'js/panels/Materials/materials-popup.reel/materials-popup.js')
-rwxr-xr-x | js/panels/Materials/materials-popup.reel/materials-popup.js | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.js b/js/panels/Materials/materials-popup.reel/materials-popup.js index 75843b66..38a6865c 100755 --- a/js/panels/Materials/materials-popup.reel/materials-popup.js +++ b/js/panels/Materials/materials-popup.reel/materials-popup.js | |||
@@ -282,29 +282,29 @@ exports.MaterialsPopup = Montage.create(Component, { | |||
282 | this._useSelection = false; | 282 | this._useSelection = false; |
283 | 283 | ||
284 | if( | 284 | if( |
285 | (materialID === "BumpMetalMaterial") || | 285 | (materialID === "Bump Metal") || |
286 | (materialID === "DeformMaterial") || | 286 | (materialID === "Deform") || |
287 | (materialID === "FlatMaterial") || | 287 | (materialID === "Flat") || |
288 | (materialID === "FlagMaterial") || | 288 | (materialID === "Flag") || |
289 | (materialID === "FlyMaterial") || | 289 | (materialID === "Fly") || |
290 | (materialID === "JuliaMaterial") || | 290 | (materialID === "Julia") || |
291 | (materialID === "KeleidoscopeMaterial") || | 291 | (materialID === "Keleidoscope") || |
292 | (materialID === "LinearGradientMaterial") || | 292 | (materialID === "Linear Gradient") || |
293 | (materialID === "MandelMaterial") || | 293 | (materialID === "Mandel") || |
294 | (materialID === "PlasmaMaterial") || | 294 | (materialID === "Plasma") || |
295 | (materialID === "PulseMaterial") || | 295 | (materialID === "Pulse") || |
296 | (materialID === "RadialBlurMaterial") || | 296 | (materialID === "Radial Blur") || |
297 | (materialID === "RadialGradientMaterial") || | 297 | (materialID === "Radial Gradient") || |
298 | (materialID === "ReliefTunnelMaterial") || | 298 | (materialID === "Relief Tunnel") || |
299 | (materialID === "SquareTunnelMaterial") || | 299 | (materialID === "Square Tunnel") || |
300 | (materialID === "StarMaterial") || | 300 | (materialID === "Star") || |
301 | (materialID === "TaperMaterial") || | 301 | (materialID === "Taper") || |
302 | (materialID === "TunnelMaterial") || | 302 | (materialID === "Tunnel") || |
303 | (materialID === "TwistMaterial") || | 303 | (materialID === "Twist") || |
304 | (materialID === "TwistVertMaterial") || | 304 | (materialID === "Twist Vertex") || |
305 | (materialID === "UberMaterial") || | 305 | (materialID === "Uber") || |
306 | (materialID === "WaterMaterial") || | 306 | (materialID === "Water") || |
307 | (materialID === "ZInvertMaterial") | 307 | (materialID === "Z-Invert") |
308 | ) | 308 | ) |
309 | { | 309 | { |
310 | material = MaterialsModel.getMaterial( materialID ); | 310 | material = MaterialsModel.getMaterial( materialID ); |