diff options
author | Eric Guzman | 2012-02-13 15:48:37 -0800 |
---|---|---|
committer | Eric Guzman | 2012-02-13 15:48:37 -0800 |
commit | b2672478decd3ee3bfacf86b525551c997f9604d (patch) | |
tree | 79a88684406d3adf00350246a4da884b97fb0eac /js/panels/Materials/materials-popup.reel/materials-popup.js | |
parent | a738121a921e4c721b280434952b415b9ab3b1a8 (diff) | |
parent | 0620e2f788861e824d6e49fa319da4d20b18a556 (diff) | |
download | ninja-b2672478decd3ee3bfacf86b525551c997f9604d.tar.gz |
Merge branch 'refs/heads/master' into StylesControllerUpdates
Conflicts:
js/controllers/styles-controller.js
Diffstat (limited to 'js/panels/Materials/materials-popup.reel/materials-popup.js')
-rw-r--r-- | js/panels/Materials/materials-popup.reel/materials-popup.js | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.js b/js/panels/Materials/materials-popup.reel/materials-popup.js index afdc3628..62ca5395 100644 --- a/js/panels/Materials/materials-popup.reel/materials-popup.js +++ b/js/panels/Materials/materials-popup.reel/materials-popup.js | |||
@@ -236,21 +236,11 @@ exports.MaterialsPopup = Montage.create(Component, { | |||
236 | { | 236 | { |
237 | this._materialName = materialID; | 237 | this._materialName = materialID; |
238 | if( | 238 | if( |
239 | (materialID === "BrickMaterial") || | 239 | (materialID === "UberMaterial") || |
240 | (materialID === "UberMaterial") || | ||
241 | (materialID === "FlatMaterial") || | 240 | (materialID === "FlatMaterial") || |
242 | (materialID === "BumpMetalMaterial") || | 241 | (materialID === "BumpMetalMaterial") || |
243 | (materialID === "PlasmaMaterial") || | ||
244 | (materialID === "LinearGradientMaterial") || | 242 | (materialID === "LinearGradientMaterial") || |
245 | (materialID === "RadialGradientMaterial") || | 243 | (materialID === "RadialGradientMaterial") |
246 | (materialID === "RadialBlurMaterial") || | ||
247 | (materialID === "PulseMaterial") || | ||
248 | (materialID === "TunnelMaterial") || | ||
249 | (materialID === "TwistMaterial") || | ||
250 | (materialID === "KeleidoscopeMaterial") || | ||
251 | (materialID === "JuliaMaterial") || | ||
252 | (materialID === "MandelMaterial") || | ||
253 | (materialID === "IridescentScalesMaterial") | ||
254 | ) | 244 | ) |
255 | { | 245 | { |
256 | var material = MaterialsLibrary.getMaterial( materialID ); | 246 | var material = MaterialsLibrary.getMaterial( materialID ); |