aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/fill-properties.reel/fill-properties.js
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-19 00:45:26 -0700
committerArmen Kesablyan2012-06-19 00:45:26 -0700
commitc59eb371559a3061ce53223e249ca97daace5968 (patch)
treef9540e26c0f273d35f92010605da65dd85bbe70c /js/components/tools-properties/fill-properties.reel/fill-properties.js
parent0f040acabfb7a4bf3138debec5aff869487ceb11 (diff)
parent918a4f5870e972b6e4e301c3237e065a1ffd26f5 (diff)
downloadninja-c59eb371559a3061ce53223e249ca97daace5968.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Diffstat (limited to 'js/components/tools-properties/fill-properties.reel/fill-properties.js')
-rwxr-xr-xjs/components/tools-properties/fill-properties.reel/fill-properties.js25
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
11var FillProperties = exports.FillProperties = Montage.create(ToolProperties, { 11var 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: {