aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Materials
diff options
context:
space:
mode:
authorEric Guzman2012-02-13 15:48:37 -0800
committerEric Guzman2012-02-13 15:48:37 -0800
commitb2672478decd3ee3bfacf86b525551c997f9604d (patch)
tree79a88684406d3adf00350246a4da884b97fb0eac /js/panels/Materials
parenta738121a921e4c721b280434952b415b9ab3b1a8 (diff)
parent0620e2f788861e824d6e49fa319da4d20b18a556 (diff)
downloadninja-b2672478decd3ee3bfacf86b525551c997f9604d.tar.gz
Merge branch 'refs/heads/master' into StylesControllerUpdates
Conflicts: js/controllers/styles-controller.js
Diffstat (limited to 'js/panels/Materials')
-rw-r--r--js/panels/Materials/Materials.xml3
-rw-r--r--js/panels/Materials/materials-popup.reel/materials-popup.js14
2 files changed, 5 insertions, 12 deletions
diff --git a/js/panels/Materials/Materials.xml b/js/panels/Materials/Materials.xml
index de07990e..e955623a 100644
--- a/js/panels/Materials/Materials.xml
+++ b/js/panels/Materials/Materials.xml
@@ -3,6 +3,9 @@
3 <folder id="ninjaMaterials" label="Ninja Materials"> 3 <folder id="ninjaMaterials" label="Ninja Materials">
4 <leaf id="UberMaterial" label="Uber" /> 4 <leaf id="UberMaterial" label="Uber" />
5 <leaf id="BumpMetalMaterial" label="Bump Metal" /> 5 <leaf id="BumpMetalMaterial" label="Bump Metal" />
6 <leaf id="LinearGradientMaterial" label="Linear Gradient" />
7 <leaf id="RadialGradientMaterial" label="Radial Gradient" />
8 <leaf id="FlatMaterial" label="Flat" />
6 </folder> 9 </folder>
7 <folder id="customMaterials" label="Custom Materials"> 10 <folder id="customMaterials" label="Custom Materials">
8 <leaf id="CheckerBoard" label="CheckerBoard" /> 11 <leaf id="CheckerBoard" label="CheckerBoard" />
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 );