diff options
author | hwc487 | 2012-06-15 11:36:35 -0700 |
---|---|---|
committer | hwc487 | 2012-06-15 11:36:35 -0700 |
commit | 043ab3f0aa5099f88a32dc377e9de1011b79611f (patch) | |
tree | d61bdd023c6bfe7ae4130db70d37ffba31b932d0 /js/panels | |
parent | 2779b48197effabe1a975c8139c497631238f8f1 (diff) | |
download | ninja-043ab3f0aa5099f88a32dc377e9de1011b79611f.tar.gz |
Re-added Raiders material
Diffstat (limited to 'js/panels')
-rw-r--r-- | js/panels/Materials/materials-data.json | 4 | ||||
-rwxr-xr-x | js/panels/Materials/materials-popup.reel/materials-popup.js | 1 |
2 files changed, 5 insertions, 0 deletions
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 | |||
@@ -61,6 +61,10 @@ | |||
61 | "id" : "Radial Gradient" | 61 | "id" : "Radial Gradient" |
62 | }, | 62 | }, |
63 | { | 63 | { |
64 | "label": "Raiders", | ||
65 | "id" : "Raiders" | ||
66 | }, | ||
67 | { | ||
64 | "label": "Relief Tunnel", | 68 | "label": "Relief Tunnel", |
65 | "id" : "Relief Tunnel" | 69 | "id" : "Relief Tunnel" |
66 | }, | 70 | }, |
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, { | |||
350 | (materialID === "Pulse") || | 350 | (materialID === "Pulse") || |
351 | (materialID === "Radial Blur") || | 351 | (materialID === "Radial Blur") || |
352 | (materialID === "Radial Gradient") || | 352 | (materialID === "Radial Gradient") || |
353 | (materialID === "Raiders") || | ||
353 | (materialID === "Relief Tunnel") || | 354 | (materialID === "Relief Tunnel") || |
354 | (materialID === "Square Tunnel") || | 355 | (materialID === "Square Tunnel") || |
355 | (materialID === "Star") || | 356 | (materialID === "Star") || |