diff options
author | Eric Guzman | 2012-07-20 11:24:19 -0700 |
---|---|---|
committer | Eric Guzman | 2012-07-20 11:24:19 -0700 |
commit | 3cc29231852440508bdeec1964e40ce59f979f99 (patch) | |
tree | 2faaf3d49337437e4a84818fe24dc64a60f8c611 /js/panels/Materials/materials-data.json | |
parent | 8fdf2fc8aefee68aec4c7b5891e0375f704cbf26 (diff) | |
parent | 9053e2037821a5c8405fabb74db9635deacfe8d5 (diff) | |
download | ninja-3cc29231852440508bdeec1964e40ce59f979f99.tar.gz |
Merge branch 'refs/heads/master' into fixes_7.1
Diffstat (limited to 'js/panels/Materials/materials-data.json')
-rw-r--r-- | js/panels/Materials/materials-data.json | 18 |
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 | }, |