aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Materials
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-12 21:50:49 -0800
committerValerio Virgillito2012-02-12 21:50:49 -0800
commitdcd147265ad0339448ea4466253b03b2899e0cea (patch)
treea2afd9a3f4b4545141b21a31002d81bb5f79f44b /js/panels/Materials
parenta30d76ff641ce89686cf5fbd9f04ac9ab4e9c830 (diff)
parente142611e22718b1f1d1696902ad9161ec5f33f98 (diff)
downloadninja-dcd147265ad0339448ea4466253b03b2899e0cea.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into stage-color
Diffstat (limited to 'js/panels/Materials')
-rw-r--r--js/panels/Materials/Materials.xml13
-rw-r--r--js/panels/Materials/materials-popup.reel/materials-popup.js14
2 files changed, 5 insertions, 22 deletions
diff --git a/js/panels/Materials/Materials.xml b/js/panels/Materials/Materials.xml
index cdeee69e..e955623a 100644
--- a/js/panels/Materials/Materials.xml
+++ b/js/panels/Materials/Materials.xml
@@ -2,17 +2,10 @@
2<tree id="Materials"> 2<tree id="Materials">
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="RadialBlurMaterial" label="Radial Blur" />
6 <leaf id="PulseMaterial" label="Pulse" />
7 <leaf id="TunnelMaterial" label="Tunnel" />
8 <leaf id="TwistMaterial" label="Twist" />
9 <leaf id="KeleidoscopeMaterial" label="Keleidoscope" />
10 <leaf id="JuliaMaterial" label="Julia" />
11 <leaf id="MandelMaterial" label="Mandel" />
12 <leaf id="PlasmaMaterial" label="Plasma" />
13 <leaf id="BumpMetalMaterial" label="Bump Metal" /> 5 <leaf id="BumpMetalMaterial" label="Bump Metal" />
14 <leaf id="LinearGradientMaterial" label="Linear Gradient" /> 6 <leaf id="LinearGradientMaterial" label="Linear Gradient" />
15 <leaf id="RadialGradientMaterial" label="Radial Gradient" /> 7 <leaf id="RadialGradientMaterial" label="Radial Gradient" />
8 <leaf id="FlatMaterial" label="Flat" />
16 </folder> 9 </folder>
17 <folder id="customMaterials" label="Custom Materials"> 10 <folder id="customMaterials" label="Custom Materials">
18 <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 );