diff options
author | hwc487 | 2012-06-14 16:09:31 -0700 |
---|---|---|
committer | hwc487 | 2012-06-14 16:09:31 -0700 |
commit | f0fc7a5678093cce986bd99fef2c5c88add19b68 (patch) | |
tree | b82ab65fe4df3514c90cf9ce5ca57d0197181078 /js/panels/Materials | |
parent | bcb0266bb6f9a578d033ad5b7b9869074e4f98a1 (diff) | |
download | ninja-f0fc7a5678093cce986bd99fef2c5c88add19b68.tar.gz |
Fix for line color.
Name change for all materials
Diffstat (limited to 'js/panels/Materials')
-rw-r--r-- | js/panels/Materials/materials-data.json | 46 | ||||
-rwxr-xr-x | js/panels/Materials/materials-popup.reel/materials-popup.js | 46 |
2 files changed, 46 insertions, 46 deletions
diff --git a/js/panels/Materials/materials-data.json b/js/panels/Materials/materials-data.json index 893489fc..ad0c1f56 100644 --- a/js/panels/Materials/materials-data.json +++ b/js/panels/Materials/materials-data.json | |||
@@ -6,95 +6,95 @@ | |||
6 | "children": [ | 6 | "children": [ |
7 | { | 7 | { |
8 | "label": "Bump Metal", | 8 | "label": "Bump Metal", |
9 | "id" : "BumpMetalMaterial" | 9 | "id" : "Bump Metal" |
10 | }, | 10 | }, |
11 | { | 11 | { |
12 | "label": "Deform", | 12 | "label": "Deform", |
13 | "id" : "DeformMaterial" | 13 | "id" : "Deform" |
14 | }, | 14 | }, |
15 | { | 15 | { |
16 | "label": "Flat", | 16 | "label": "Flat", |
17 | "id" : "FlatMaterial" | 17 | "id" : "Flat" |
18 | }, | 18 | }, |
19 | { | 19 | { |
20 | "label": "Flag", | 20 | "label": "Flag", |
21 | "id" : "FlagMaterial" | 21 | "id" : "Flag" |
22 | }, | 22 | }, |
23 | { | 23 | { |
24 | "label": "Fly", | 24 | "label": "Fly", |
25 | "id" : "FlyMaterial" | 25 | "id" : "Fly" |
26 | }, | 26 | }, |
27 | { | 27 | { |
28 | "label": "Julia", | 28 | "label": "Julia", |
29 | "id" : "JuliaMaterial" | 29 | "id" : "Julia" |
30 | }, | 30 | }, |
31 | { | 31 | { |
32 | "label": "Keleidoscope", | 32 | "label": "Keleidoscope", |
33 | "id" : "KeleidoscopeMaterial" | 33 | "id" : "Keleidoscope" |
34 | }, | 34 | }, |
35 | { | 35 | { |
36 | "label": "Linear Gradient", | 36 | "label": "Linear Gradient", |
37 | "id" : "LinearGradientMaterial" | 37 | "id" : "Linear Gradient" |
38 | }, | 38 | }, |
39 | { | 39 | { |
40 | "label": "Mandel", | 40 | "label": "Mandel", |
41 | "id" : "MandelMaterial" | 41 | "id" : "Mandel" |
42 | }, | 42 | }, |
43 | { | 43 | { |
44 | "label": "Plasma", | 44 | "label": "Plasma", |
45 | "id" : "PlasmaMaterial" | 45 | "id" : "Plasma" |
46 | }, | 46 | }, |
47 | { | 47 | { |
48 | "label": "Pulse", | 48 | "label": "Pulse", |
49 | "id" : "PulseMaterial" | 49 | "id" : "Pulse" |
50 | }, | 50 | }, |
51 | { | 51 | { |
52 | "label": "Radial Blur", | 52 | "label": "Radial Blur", |
53 | "id" : "RadialBlurMaterial" | 53 | "id" : "Radial Blur" |
54 | }, | 54 | }, |
55 | { | 55 | { |
56 | "label": "Radial Gradient", | 56 | "label": "Radial Gradient", |
57 | "id" : "RadialGradientMaterial" | 57 | "id" : "Radial Gradient" |
58 | }, | 58 | }, |
59 | { | 59 | { |
60 | "label": "Relief Tunnel", | 60 | "label": "Relief Tunnel", |
61 | "id" : "ReliefTunnelMaterial" | 61 | "id" : "Relief Tunnel" |
62 | }, | 62 | }, |
63 | { | 63 | { |
64 | "label": "Square Tunnel", | 64 | "label": "Square Tunnel", |
65 | "id" : "SquareTunnelMaterial" | 65 | "id" : "Square Tunnel" |
66 | }, | 66 | }, |
67 | { | 67 | { |
68 | "label": "Star", | 68 | "label": "Star", |
69 | "id" : "StarMaterial" | 69 | "id" : "Star" |
70 | }, | 70 | }, |
71 | { | 71 | { |
72 | "label": "Taper", | 72 | "label": "Taper", |
73 | "id" : "TaperMaterial" | 73 | "id" : "Taper" |
74 | }, | 74 | }, |
75 | { | 75 | { |
76 | "label": "Tunnel", | 76 | "label": "Tunnel", |
77 | "id" : "TunnelMaterial" | 77 | "id" : "Tunnel" |
78 | }, | 78 | }, |
79 | { | 79 | { |
80 | "label": "Twist", | 80 | "label": "Twist", |
81 | "id" : "TwistMaterial" | 81 | "id" : "Twist" |
82 | }, | 82 | }, |
83 | { | 83 | { |
84 | "label": "Twist Vertex", | 84 | "label": "Twist Vertex", |
85 | "id" : "TwistVertMaterial" | 85 | "id" : "Twist Vertex" |
86 | }, | 86 | }, |
87 | { | 87 | { |
88 | "label": "Uber", | 88 | "label": "Uber", |
89 | "id" : "UberMaterial" | 89 | "id" : "Uber" |
90 | }, | 90 | }, |
91 | { | 91 | { |
92 | "label": "Water", | 92 | "label": "Water", |
93 | "id" : "WaterMaterial" | 93 | "id" : "Water" |
94 | }, | 94 | }, |
95 | { | 95 | { |
96 | "label": "Z-Invert", | 96 | "label": "Z-Invert", |
97 | "id" : "ZInvertMaterial" | 97 | "id" : "Z-Invert" |
98 | } | 98 | } |
99 | ] | 99 | ] |
100 | } | 100 | } |
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.js b/js/panels/Materials/materials-popup.reel/materials-popup.js index 75843b66..38a6865c 100755 --- a/js/panels/Materials/materials-popup.reel/materials-popup.js +++ b/js/panels/Materials/materials-popup.reel/materials-popup.js | |||
@@ -282,29 +282,29 @@ exports.MaterialsPopup = Montage.create(Component, { | |||
282 | this._useSelection = false; | 282 | this._useSelection = false; |
283 | 283 | ||
284 | if( | 284 | if( |
285 | (materialID === "BumpMetalMaterial") || | 285 | (materialID === "Bump Metal") || |
286 | (materialID === "DeformMaterial") || | 286 | (materialID === "Deform") || |
287 | (materialID === "FlatMaterial") || | 287 | (materialID === "Flat") || |
288 | (materialID === "FlagMaterial") || | 288 | (materialID === "Flag") || |
289 | (materialID === "FlyMaterial") || | 289 | (materialID === "Fly") || |
290 | (materialID === "JuliaMaterial") || | 290 | (materialID === "Julia") || |
291 | (materialID === "KeleidoscopeMaterial") || | 291 | (materialID === "Keleidoscope") || |
292 | (materialID === "LinearGradientMaterial") || | 292 | (materialID === "Linear Gradient") || |
293 | (materialID === "MandelMaterial") || | 293 | (materialID === "Mandel") || |
294 | (materialID === "PlasmaMaterial") || | 294 | (materialID === "Plasma") || |
295 | (materialID === "PulseMaterial") || | 295 | (materialID === "Pulse") || |
296 | (materialID === "RadialBlurMaterial") || | 296 | (materialID === "Radial Blur") || |
297 | (materialID === "RadialGradientMaterial") || | 297 | (materialID === "Radial Gradient") || |
298 | (materialID === "ReliefTunnelMaterial") || | 298 | (materialID === "Relief Tunnel") || |
299 | (materialID === "SquareTunnelMaterial") || | 299 | (materialID === "Square Tunnel") || |
300 | (materialID === "StarMaterial") || | 300 | (materialID === "Star") || |
301 | (materialID === "TaperMaterial") || | 301 | (materialID === "Taper") || |
302 | (materialID === "TunnelMaterial") || | 302 | (materialID === "Tunnel") || |
303 | (materialID === "TwistMaterial") || | 303 | (materialID === "Twist") || |
304 | (materialID === "TwistVertMaterial") || | 304 | (materialID === "Twist Vertex") || |
305 | (materialID === "UberMaterial") || | 305 | (materialID === "Uber") || |
306 | (materialID === "WaterMaterial") || | 306 | (materialID === "Water") || |
307 | (materialID === "ZInvertMaterial") | 307 | (materialID === "Z-Invert") |
308 | ) | 308 | ) |
309 | { | 309 | { |
310 | material = MaterialsModel.getMaterial( materialID ); | 310 | material = MaterialsModel.getMaterial( materialID ); |