aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/fill-properties.reel
diff options
context:
space:
mode:
authorPushkar Joshi2012-06-13 14:00:31 -0700
committerPushkar Joshi2012-06-13 14:00:31 -0700
commit596765056ca6e5b08395c6d7ea19e7684c2acaf3 (patch)
tree480f42ffc0782ca768284c1208a8f99adb5636a2 /js/components/tools-properties/fill-properties.reel
parent75df16b937bb420e7d93a411e73f7b59578b1b7e (diff)
parent682f4917d6badd105998c3dd84d031c38b51f017 (diff)
downloadninja-596765056ca6e5b08395c6d7ea19e7684c2acaf3.tar.gz
Merge branch 'master' into brushtool
Diffstat (limited to 'js/components/tools-properties/fill-properties.reel')
-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: {