diff options
author | Jonathan Duran | 2012-05-22 10:32:03 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-05-22 10:32:03 -0700 |
commit | 7b76e4664b35f044e9f24c060f1e092cb5e5c4b0 (patch) | |
tree | f0f6168b083aa929d34f37edca6c87ce7c3743bd /js/components/tools-properties/rect-properties.reel/rect-properties.js | |
parent | 0dc43f8b6d7db6d9ed698e8c4568e942d8e3d8eb (diff) | |
parent | c37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff) | |
download | ninja-7b76e4664b35f044e9f24c060f1e092cb5e5c4b0.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/components/tools-properties/rect-properties.reel/rect-properties.js')
-rwxr-xr-x | js/components/tools-properties/rect-properties.reel/rect-properties.js | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/js/components/tools-properties/rect-properties.reel/rect-properties.js b/js/components/tools-properties/rect-properties.reel/rect-properties.js index f023f4bb..c1cb3945 100755 --- a/js/components/tools-properties/rect-properties.reel/rect-properties.js +++ b/js/components/tools-properties/rect-properties.reel/rect-properties.js | |||
@@ -42,6 +42,14 @@ exports.RectProperties = Montage.create(ToolProperties, { | |||
42 | }, | 42 | }, |
43 | 43 | ||
44 | // Public API | 44 | // Public API |
45 | fill: { | ||
46 | get: function () { return this.base.fill; } | ||
47 | }, | ||
48 | |||
49 | stroke: { | ||
50 | get: function () { return this.base.stroke; } | ||
51 | }, | ||
52 | |||
45 | use3D: { | 53 | use3D: { |
46 | get: function() { return this.base._use3D; } | 54 | get: function() { return this.base._use3D; } |
47 | }, | 55 | }, |
@@ -125,6 +133,4 @@ exports.RectProperties = Montage.create(ToolProperties, { | |||
125 | 133 | ||
126 | } | 134 | } |
127 | } | 135 | } |
128 | |||
129 | |||
130 | }); \ No newline at end of file | 136 | }); \ No newline at end of file |