aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Materials
diff options
context:
space:
mode:
authorhwc4872012-06-15 11:26:57 -0700
committerhwc4872012-06-15 11:26:57 -0700
commit2779b48197effabe1a975c8139c497631238f8f1 (patch)
tree3469d6b7b7fbc6a7d1c9a2631c5ded0a38d69161 /js/panels/Materials
parent9f74616f7727bf8cf988021ba0cd5d3354d67991 (diff)
downloadninja-2779b48197effabe1a975c8139c497631238f8f1.tar.gz
Re-added Paris material
Diffstat (limited to 'js/panels/Materials')
-rw-r--r--js/panels/Materials/materials-data.json4
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.js1
2 files changed, 5 insertions, 0 deletions
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
@@ -41,6 +41,10 @@
41 "id" : "Mandel" 41 "id" : "Mandel"
42 }, 42 },
43 { 43 {
44 "label": "Paris",
45 "id" : "Paris"
46 },
47 {
44 "label": "Plasma", 48 "label": "Plasma",
45 "id" : "Plasma" 49 "id" : "Plasma"
46 }, 50 },
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, {
345 (materialID === "Keleidoscope") || 345 (materialID === "Keleidoscope") ||
346 (materialID === "Linear Gradient") || 346 (materialID === "Linear Gradient") ||
347 (materialID === "Mandel") || 347 (materialID === "Mandel") ||
348 (materialID === "Paris") ||
348 (materialID === "Plasma") || 349 (materialID === "Plasma") ||
349 (materialID === "Pulse") || 350 (materialID === "Pulse") ||
350 (materialID === "Radial Blur") || 351 (materialID === "Radial Blur") ||