aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Materials
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-19 15:59:38 -0700
committerValerio Virgillito2012-07-19 15:59:38 -0700
commitb05137f559b6445017973d550fab5e43d6f4df57 (patch)
tree6554afcb8c3b8d83d1e9bb33241e239773f396e8 /js/panels/Materials
parentfc13ef1e806116bb7ece5bb06604fa4f5714a6ed (diff)
parent431b6fa7610e59074b4ebb3e9e712672f185b8ad (diff)
downloadninja-b05137f559b6445017973d550fab5e43d6f4df57.tar.gz
Merge branch 'RadialBlur' of https://github.com/ericmueller/ninja
Diffstat (limited to 'js/panels/Materials')
-rw-r--r--js/panels/Materials/materials-data.json18
1 files changed, 13 insertions, 5 deletions
diff --git a/js/panels/Materials/materials-data.json b/js/panels/Materials/materials-data.json
index abdacbe1..6fe5da69 100644
--- a/js/panels/Materials/materials-data.json
+++ b/js/panels/Materials/materials-data.json
@@ -5,10 +5,18 @@
5 "label": "Ninja Materials", 5 "label": "Ninja Materials",
6 "children": [ 6 "children": [
7 { 7 {
8 "label": "Blue Sky",
9 "id" : "Blue Sky"
10 },
11 {
8 "label": "Bump Metal", 12 "label": "Bump Metal",
9 "id" : "Bump Metal" 13 "id" : "Bump Metal"
10 }, 14 },
11 { 15 {
16 "label": "Dark Blur",
17 "id" : "Dark Blur"
18 },
19 {
12 "label": "Flag", 20 "label": "Flag",
13 "id" : "Flag" 21 "id" : "Flag"
14 }, 22 },
@@ -17,10 +25,6 @@
17 "id" : "Linear Gradient" 25 "id" : "Linear Gradient"
18 }, 26 },
19 { 27 {
20 "label": "Paris",
21 "id" : "Paris"
22 },
23 {
24 "label": "Plasma", 28 "label": "Plasma",
25 "id" : "Plasma" 29 "id" : "Plasma"
26 }, 30 },
@@ -29,6 +33,10 @@
29 "id" : "Pulse" 33 "id" : "Pulse"
30 }, 34 },
31 { 35 {
36 "label": "Radial Blur",
37 "id" : "Radial Blur"
38 },
39 {
32 "label": "Radial Gradient", 40 "label": "Radial Gradient",
33 "id" : "Radial Gradient" 41 "id" : "Radial Gradient"
34 }, 42 },