aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Materials/materials-data.json
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-07-20 09:52:03 -0700
committerJose Antonio Marquez2012-07-20 09:52:03 -0700
commit5d82978e9a0e0daf7c457ff87be95a3b4301999e (patch)
tree906f908fef755b8e0f57ab7a0d9ce348c398958b /js/panels/Materials/materials-data.json
parenta8b7648d2c1305eb068d42ebde9b042ee6de72ab (diff)
parent9053e2037821a5c8405fabb74db9635deacfe8d5 (diff)
downloadninja-5d82978e9a0e0daf7c457ff87be95a3b4301999e.tar.gz
Merge branch 'refs/heads/Ninja-Master' into Document
Diffstat (limited to 'js/panels/Materials/materials-data.json')
-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 },