diff options
author | Jose Antonio Marquez | 2012-06-13 14:03:00 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-06-13 14:03:00 -0700 |
commit | efbe5f83157a8dcbcc209c88877d9cd0113d4d20 (patch) | |
tree | 50565e097fe4a9db59e554af179f66938fa59f1c /js/components/tools-properties/fill-properties.reel | |
parent | ae90152ae2889a10d44c22e1eeb5bff16cc44a19 (diff) | |
parent | 682f4917d6badd105998c3dd84d031c38b51f017 (diff) | |
download | ninja-efbe5f83157a8dcbcc209c88877d9cd0113d4d20.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into Color
Diffstat (limited to 'js/components/tools-properties/fill-properties.reel')
-rwxr-xr-x | js/components/tools-properties/fill-properties.reel/fill-properties.js | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/js/components/tools-properties/fill-properties.reel/fill-properties.js b/js/components/tools-properties/fill-properties.reel/fill-properties.js index 7331b375..ef1699af 100755 --- a/js/components/tools-properties/fill-properties.reel/fill-properties.js +++ b/js/components/tools-properties/fill-properties.reel/fill-properties.js | |||
@@ -10,6 +10,31 @@ var Montage = require("montage/core/core").Montage, | |||
10 | 10 | ||
11 | var FillProperties = exports.FillProperties = Montage.create(ToolProperties, { | 11 | var FillProperties = exports.FillProperties = Montage.create(ToolProperties, { |
12 | 12 | ||
13 | useFillColor: { | ||
14 | value: null, | ||
15 | serializable: true | ||
16 | }, | ||
17 | |||
18 | _fillColorCtrl: { | ||
19 | value: null, | ||
20 | serializable: true | ||
21 | }, | ||
22 | |||
23 | useWebGL: { | ||
24 | value: null, | ||
25 | serializable: true | ||
26 | }, | ||
27 | |||
28 | _materialsContainer: { | ||
29 | value: null, | ||
30 | serializable: true | ||
31 | }, | ||
32 | |||
33 | fillMaterial: { | ||
34 | value: null, | ||
35 | serializable: true | ||
36 | }, | ||
37 | |||
13 | addedColorChips: { value: false }, | 38 | addedColorChips: { value: false }, |
14 | 39 | ||
15 | _fill: { | 40 | _fill: { |