From 043ab3f0aa5099f88a32dc377e9de1011b79611f Mon Sep 17 00:00:00 2001
From: hwc487
Date: Fri, 15 Jun 2012 11:36:35 -0700
Subject: Re-added Raiders material

---
 js/lib/rdge/materials/radial-blur-material.js               | 2 +-
 js/panels/Materials/materials-data.json                     | 4 ++++
 js/panels/Materials/materials-popup.reel/materials-popup.js | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'js')

diff --git a/js/lib/rdge/materials/radial-blur-material.js b/js/lib/rdge/materials/radial-blur-material.js
index c130544f..68a92b0f 100644
--- a/js/lib/rdge/materials/radial-blur-material.js
+++ b/js/lib/rdge/materials/radial-blur-material.js
@@ -146,7 +146,7 @@ var RaidersMaterial = function RaidersMaterial() {
     this.inheritedFrom = RadialBlurMaterial;
     this.inheritedFrom();
 
-    this._name = "Raiders Material";
+    this._name = "Raiders";
     this._shaderName = "raiders";
 
     this._texMap = 'assets/images/raiders.png';
diff --git a/js/panels/Materials/materials-data.json b/js/panels/Materials/materials-data.json
index 221fdd2b..8df9e600 100644
--- a/js/panels/Materials/materials-data.json
+++ b/js/panels/Materials/materials-data.json
@@ -60,6 +60,10 @@
                     "label": "Radial Gradient",
                     "id" : "Radial Gradient"
                 },
+                {
+                    "label": "Raiders",
+                    "id" : "Raiders"
+                },
                 {
                     "label": "Relief Tunnel",
                     "id" : "Relief Tunnel"
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.js b/js/panels/Materials/materials-popup.reel/materials-popup.js
index 8240c746..40f07509 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.js
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.js
@@ -350,6 +350,7 @@ exports.MaterialsPopup = Montage.create(Component, {
 						(materialID ===  "Pulse")			||
 						(materialID ===  "Radial Blur")		||
 						(materialID ===  "Radial Gradient")	||
+						(materialID ===  "Raiders")			||
 						(materialID ===  "Relief Tunnel")	||
 						(materialID ===  "Square Tunnel")	||
 						(materialID ===  "Star")			||
-- 
cgit v1.2.3