From 2779b48197effabe1a975c8139c497631238f8f1 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Fri, 15 Jun 2012 11:26:57 -0700
Subject: Re-added Paris material

---
 js/panels/Materials/materials-data.json                     | 4 ++++
 js/panels/Materials/materials-popup.reel/materials-popup.js | 1 +
 2 files changed, 5 insertions(+)

(limited to 'js/panels/Materials')

diff --git a/js/panels/Materials/materials-data.json b/js/panels/Materials/materials-data.json
index ad0c1f56..221fdd2b 100644
--- a/js/panels/Materials/materials-data.json
+++ b/js/panels/Materials/materials-data.json
@@ -40,6 +40,10 @@
                     "label": "Mandel",
                     "id" : "Mandel"
                 },
+                {
+                    "label": "Paris",
+                    "id" : "Paris"
+                },
                 {
                     "label": "Plasma",
                     "id" : "Plasma"
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.js b/js/panels/Materials/materials-popup.reel/materials-popup.js
index e9535f94..8240c746 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.js
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.js
@@ -345,6 +345,7 @@ exports.MaterialsPopup = Montage.create(Component, {
 						(materialID ===  "Keleidoscope")	||
 						(materialID ===  "Linear Gradient")	||
 						(materialID ===  "Mandel")			||
+						(materialID ===  "Paris")			||
 						(materialID ===  "Plasma")			||
 						(materialID ===  "Pulse")			||
 						(materialID ===  "Radial Blur")		||
-- 
cgit v1.2.3