From 805059d68087530721212a650412aefb85e98d1f Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Thu, 9 Feb 2012 10:26:57 -0800
Subject: Removed unused materials.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/panels/Materials/Materials.xml                          |  5 ++++-
 .../Materials/materials-popup.reel/materials-popup.js      | 14 ++------------
 2 files changed, 6 insertions(+), 13 deletions(-)

(limited to 'js/panels/Materials')

diff --git a/js/panels/Materials/Materials.xml b/js/panels/Materials/Materials.xml
index de07990e..d300b495 100644
--- a/js/panels/Materials/Materials.xml
+++ b/js/panels/Materials/Materials.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <tree id="Materials">
     <folder id="ninjaMaterials" label="Ninja Materials">
-	  <leaf id="UberMaterial" label="Uber" />
+	    <leaf id="UberMaterial" label="Uber" />
         <leaf id="BumpMetalMaterial" label="Bump Metal" />
+        <leaf id="LinearGradientMaterial" label="Linear Gradient" />
+        <leaf id="RadialGradientMaterial" label="Radial Gradient" />
+        <leaf id="FlatMaterial" label="Flat" />
     </folder>
     <folder id="customMaterials" label="Custom Materials">
         <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, {
 		{
            this._materialName = materialID;
             if(	
-					(materialID === "BrickMaterial")				||
-					(materialID ===  "UberMaterial")				|| 
+					(materialID ===  "UberMaterial")				||
 					(materialID ===  "FlatMaterial")				||
  					(materialID ===  "BumpMetalMaterial")			||
- 					(materialID ===  "PlasmaMaterial")				||
  					(materialID ===  "LinearGradientMaterial")		||
- 					(materialID ===  "RadialGradientMaterial")		||
- 					(materialID ===  "RadialBlurMaterial")			||
- 					(materialID ===  "PulseMaterial")				||
- 					(materialID ===  "TunnelMaterial")				||
- 					(materialID ===  "TwistMaterial")				||
- 					(materialID ===  "KeleidoscopeMaterial")		||
- 					(materialID ===  "JuliaMaterial")				||
- 					(materialID ===  "MandelMaterial")				||
- 					(materialID ===  "IridescentScalesMaterial")
+ 					(materialID ===  "RadialGradientMaterial")
 				)
 			{
 				var material = MaterialsLibrary.getMaterial( materialID );
-- 
cgit v1.2.3