aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/brush-properties.reel/brush-properties.js
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/brush-properties.reel/brush-properties.js
parent75df16b937bb420e7d93a411e73f7b59578b1b7e (diff)
parent682f4917d6badd105998c3dd84d031c38b51f017 (diff)
downloadninja-596765056ca6e5b08395c6d7ea19e7684c2acaf3.tar.gz
Merge branch 'master' into brushtool
Diffstat (limited to 'js/components/tools-properties/brush-properties.reel/brush-properties.js')
-rwxr-xr-xjs/components/tools-properties/brush-properties.reel/brush-properties.js40
1 files changed, 40 insertions, 0 deletions
diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.js b/js/components/tools-properties/brush-properties.reel/brush-properties.js
index 7a0d21f1..1af128af 100755
--- a/js/components/tools-properties/brush-properties.reel/brush-properties.js
+++ b/js/components/tools-properties/brush-properties.reel/brush-properties.js
@@ -11,6 +11,46 @@ var ToolProperties = require("js/components/tools-properties/tool-properties").T
11var BrushProperties = exports.BrushProperties = Montage.create(ToolProperties, { 11var BrushProperties = exports.BrushProperties = Montage.create(ToolProperties, {
12 addedColorChips: { value: false }, 12 addedColorChips: { value: false },
13 13
14 _fillColorCtrl: {
15 value: null,
16 serializable: true
17 },
18
19 _strokeSize: {
20 value: null,
21 serializable: true
22 },
23
24 _strokeHardness: {
25 value: null,
26 serializable: true
27 },
28
29 _doSmoothing: {
30 value: null,
31 serializable: true
32 },
33
34 _smoothingAmount: {
35 value: null,
36 serializable: true
37 },
38
39 _useCalligraphic: {
40 value: null,
41 serializable: true
42 },
43
44 _strokeAngle: {
45 value: null,
46 serializable: true
47 },
48
49 _angleLabel: {
50 value: null,
51 serializable: true
52 },
53
14 _fill: { 54 _fill: {
15 enumerable: false, 55 enumerable: false,
16 value: { colorMode: 'rgb', color: { r: 0, g: 0, b: 0, a: 1, css: 'rgb(0,0,0)', mode: 'rgb', wasSetByCode: true, type: 'change' }, webGlColor: [0, 0, 0, 1] } 56 value: { colorMode: 'rgb', color: { r: 0, g: 0, b: 0, a: 1, css: 'rgb(0,0,0)', mode: 'rgb', wasSetByCode: true, type: 'change' }, webGlColor: [0, 0, 0, 1] }