diff options
| author | hwc487 | 2012-07-11 10:20:22 -0700 |
|---|---|---|
| committer | hwc487 | 2012-07-11 10:20:22 -0700 |
| commit | 325cf1dcbd7fc1e1ec6a9ac4829954f7e0ae2afb (patch) | |
| tree | b1f12bce35d5281a3a3d47e3cdcbd75d4c498810 /js/panels/Materials | |
| parent | 67dd4bdd47a0324507bed232d22068aa198549fe (diff) | |
| parent | 688e22dc367f37d4b8734a37daa3b823ea450295 (diff) | |
| download | ninja-325cf1dcbd7fc1e1ec6a9ac4829954f7e0ae2afb.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja into GridFixes
Conflicts:
assets/shaders/radialBlur.frag.glsl
Diffstat (limited to 'js/panels/Materials')
| -rw-r--r-- | js/panels/Materials/materials-data.json | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/js/panels/Materials/materials-data.json b/js/panels/Materials/materials-data.json index fde82d3d..abdacbe1 100644 --- a/js/panels/Materials/materials-data.json +++ b/js/panels/Materials/materials-data.json | |||
| @@ -9,34 +9,14 @@ | |||
| 9 | "id" : "Bump Metal" | 9 | "id" : "Bump Metal" |
| 10 | }, | 10 | }, |
| 11 | { | 11 | { |
| 12 | "label": "Deform", | ||
| 13 | "id" : "Deform" | ||
| 14 | }, | ||
| 15 | { | ||
| 16 | "label": "Flag", | 12 | "label": "Flag", |
| 17 | "id" : "Flag" | 13 | "id" : "Flag" |
| 18 | }, | 14 | }, |
| 19 | { | 15 | { |
| 20 | "label": "Fly", | ||
| 21 | "id" : "Fly" | ||
| 22 | }, | ||
| 23 | { | ||
| 24 | "label": "Julia", | ||
| 25 | "id" : "Julia" | ||
| 26 | }, | ||
| 27 | { | ||
| 28 | "label": "Keleidoscope", | ||
| 29 | "id" : "Keleidoscope" | ||
| 30 | }, | ||
| 31 | { | ||
| 32 | "label": "Linear Gradient", | 16 | "label": "Linear Gradient", |
| 33 | "id" : "Linear Gradient" | 17 | "id" : "Linear Gradient" |
| 34 | }, | 18 | }, |
| 35 | { | 19 | { |
| 36 | "label": "Mandel", | ||
| 37 | "id" : "Mandel" | ||
| 38 | }, | ||
| 39 | { | ||
| 40 | "label": "Paris", | 20 | "label": "Paris", |
| 41 | "id" : "Paris" | 21 | "id" : "Paris" |
| 42 | }, | 22 | }, |
| @@ -49,42 +29,14 @@ | |||
| 49 | "id" : "Pulse" | 29 | "id" : "Pulse" |
| 50 | }, | 30 | }, |
| 51 | { | 31 | { |
| 52 | "label": "Radial Blur", | ||
| 53 | "id" : "Radial Blur" | ||
| 54 | }, | ||
| 55 | { | ||
| 56 | "label": "Radial Gradient", | 32 | "label": "Radial Gradient", |
| 57 | "id" : "Radial Gradient" | 33 | "id" : "Radial Gradient" |
| 58 | }, | 34 | }, |
| 59 | { | 35 | { |
| 60 | "label": "Raiders", | ||
| 61 | "id" : "Raiders" | ||
| 62 | }, | ||
| 63 | { | ||
| 64 | "label": "Relief Tunnel", | ||
| 65 | "id" : "Relief Tunnel" | ||
| 66 | }, | ||
| 67 | { | ||
| 68 | "label": "Square Tunnel", | ||
| 69 | "id" : "Square Tunnel" | ||
| 70 | }, | ||
| 71 | { | ||
| 72 | "label": "Star", | ||
| 73 | "id" : "Star" | ||
| 74 | }, | ||
| 75 | { | ||
| 76 | "label": "Taper", | 36 | "label": "Taper", |
| 77 | "id" : "Taper" | 37 | "id" : "Taper" |
| 78 | }, | 38 | }, |
| 79 | { | 39 | { |
| 80 | "label": "Tunnel", | ||
| 81 | "id" : "Tunnel" | ||
| 82 | }, | ||
| 83 | { | ||
| 84 | "label": "Twist", | ||
| 85 | "id" : "Twist" | ||
| 86 | }, | ||
| 87 | { | ||
| 88 | "label": "Twist Vertex", | 40 | "label": "Twist Vertex", |
| 89 | "id" : "Twist Vertex" | 41 | "id" : "Twist Vertex" |
| 90 | }, | 42 | }, |
| @@ -95,10 +47,6 @@ | |||
| 95 | { | 47 | { |
| 96 | "label": "Water", | 48 | "label": "Water", |
| 97 | "id" : "Water" | 49 | "id" : "Water" |
| 98 | }, | ||
| 99 | { | ||
| 100 | "label": "Z-Invert", | ||
| 101 | "id" : "Z-Invert" | ||
| 102 | } | 50 | } |
| 103 | ] | 51 | ] |
| 104 | }, | 52 | }, |