From f0fc7a5678093cce986bd99fef2c5c88add19b68 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Thu, 14 Jun 2012 16:09:31 -0700
Subject: Fix for line color.

Name change for all materials
---
 js/panels/Materials/materials-data.json            | 46 +++++++++++-----------
 .../materials-popup.reel/materials-popup.js        | 46 +++++++++++-----------
 2 files changed, 46 insertions(+), 46 deletions(-)

(limited to 'js/panels/Materials')

diff --git a/js/panels/Materials/materials-data.json b/js/panels/Materials/materials-data.json
index 893489fc..ad0c1f56 100644
--- a/js/panels/Materials/materials-data.json
+++ b/js/panels/Materials/materials-data.json
@@ -6,95 +6,95 @@
             "children": [
                 {
                     "label": "Bump Metal",
-                    "id" : "BumpMetalMaterial"
+                    "id" : "Bump Metal"
                 },
                 {
                     "label": "Deform",
-                    "id" : "DeformMaterial"
+                    "id" : "Deform"
                 },
                 {
                     "label": "Flat",
-                    "id" : "FlatMaterial"
+                    "id" : "Flat"
                 },
                 {
                     "label": "Flag",
-                    "id" : "FlagMaterial"
+                    "id" : "Flag"
                 },
                 {
                     "label": "Fly",
-                    "id" : "FlyMaterial"
+                    "id" : "Fly"
                 },
                 {
                     "label": "Julia",
-                    "id" : "JuliaMaterial"
+                    "id" : "Julia"
                 },
                 {
                     "label": "Keleidoscope",
-                    "id" : "KeleidoscopeMaterial"
+                    "id" : "Keleidoscope"
                 },
                 {
                     "label": "Linear Gradient",
-                    "id" : "LinearGradientMaterial"
+                    "id" : "Linear Gradient"
                 },
                 {
                     "label": "Mandel",
-                    "id" : "MandelMaterial"
+                    "id" : "Mandel"
                 },
                 {
                     "label": "Plasma",
-                    "id" : "PlasmaMaterial"
+                    "id" : "Plasma"
                 },
                 {
                     "label": "Pulse",
-                    "id" : "PulseMaterial"
+                    "id" : "Pulse"
                 },
                 {
                     "label": "Radial Blur",
-                    "id" : "RadialBlurMaterial"
+                    "id" : "Radial Blur"
                 },
                 {
                     "label": "Radial Gradient",
-                    "id" : "RadialGradientMaterial"
+                    "id" : "Radial Gradient"
                 },
                 {
                     "label": "Relief Tunnel",
-                    "id" : "ReliefTunnelMaterial"
+                    "id" : "Relief Tunnel"
                 },
                 {
                     "label": "Square Tunnel",
-                    "id" : "SquareTunnelMaterial"
+                    "id" : "Square Tunnel"
                 },
                 {
                     "label": "Star",
-                    "id" : "StarMaterial"
+                    "id" : "Star"
                 },
                 {
                     "label": "Taper",
-                    "id" : "TaperMaterial"
+                    "id" : "Taper"
                 },
                 {
                     "label": "Tunnel",
-                    "id" : "TunnelMaterial"
+                    "id" : "Tunnel"
                 },
                 {
                     "label": "Twist",
-                    "id" : "TwistMaterial"
+                    "id" : "Twist"
                 },
                 {
                     "label": "Twist Vertex",
-                    "id" : "TwistVertMaterial"
+                    "id" : "Twist Vertex"
                 },
                 {
                     "label": "Uber",
-                    "id" : "UberMaterial"
+                    "id" : "Uber"
                 },
                 {
                     "label": "Water",
-                    "id" : "WaterMaterial"
+                    "id" : "Water"
                 },
                 {
                     "label": "Z-Invert",
-                    "id" : "ZInvertMaterial"
+                    "id" : "Z-Invert"
                 }
             ]
         }
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, {
 				this._useSelection = false;
 
 				if(
-						(materialID ===  "BumpMetalMaterial")		||
-						(materialID ===  "DeformMaterial")			||
-						(materialID ===  "FlatMaterial")			||
-						(materialID ===  "FlagMaterial")			||
-						(materialID ===  "FlyMaterial")				||
-						(materialID ===  "JuliaMaterial")			||
-						(materialID ===  "KeleidoscopeMaterial")	||
-						(materialID ===  "LinearGradientMaterial")	||
-						(materialID ===  "MandelMaterial")			||
-						(materialID ===  "PlasmaMaterial")			||
-						(materialID ===  "PulseMaterial")			||
-						(materialID ===  "RadialBlurMaterial")		||
-						(materialID ===  "RadialGradientMaterial")	||
-						(materialID ===  "ReliefTunnelMaterial")	||
-						(materialID ===  "SquareTunnelMaterial")	||
-						(materialID ===  "StarMaterial")			||
-						(materialID ===  "TaperMaterial")			||
-						(materialID ===  "TunnelMaterial")			||
-						(materialID ===  "TwistMaterial")			||
-						(materialID ===  "TwistVertMaterial")		||
-						(materialID ===  "UberMaterial")			||
-						(materialID ===  "WaterMaterial")			||
-						(materialID ===  "ZInvertMaterial")
+						(materialID ===  "Bump Metal")		||
+						(materialID ===  "Deform")			||
+						(materialID ===  "Flat")			||
+						(materialID ===  "Flag")			||
+						(materialID ===  "Fly")				||
+						(materialID ===  "Julia")			||
+						(materialID ===  "Keleidoscope")	||
+						(materialID ===  "Linear Gradient")	||
+						(materialID ===  "Mandel")			||
+						(materialID ===  "Plasma")			||
+						(materialID ===  "Pulse")			||
+						(materialID ===  "Radial Blur")		||
+						(materialID ===  "Radial Gradient")	||
+						(materialID ===  "Relief Tunnel")	||
+						(materialID ===  "Square Tunnel")	||
+						(materialID ===  "Star")			||
+						(materialID ===  "Taper")			||
+						(materialID ===  "Tunnel")			||
+						(materialID ===  "Twist")			||
+						(materialID ===  "Twist Vertex")	||
+						(materialID ===  "Uber")			||
+						(materialID ===  "Water")			||
+						(materialID ===  "Z-Invert")
 					)
 				{
 					material = MaterialsModel.getMaterial( materialID );
-- 
cgit v1.2.3