diff options
author | Jon Reid | 2012-05-15 11:24:53 -0700 |
---|---|---|
committer | Jon Reid | 2012-05-15 11:24:53 -0700 |
commit | 3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch) | |
tree | d6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/tools/RectTool.js | |
parent | 53a604d0ccb1315576b94406cf3b0b958162307b (diff) | |
parent | e33a4e58c271a9507082694a5268b840fdd05968 (diff) | |
download | ninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz |
Merge branch 'timeline-local' into timeline-multiselect
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
resolved using theirs. (selectLayers)
Diffstat (limited to 'js/tools/RectTool.js')
-rwxr-xr-x | js/tools/RectTool.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/tools/RectTool.js b/js/tools/RectTool.js index 0c14a559..0a3c8200 100755 --- a/js/tools/RectTool.js +++ b/js/tools/RectTool.js | |||
@@ -87,7 +87,7 @@ exports.RectTool = Montage.create(ShapeTool, { | |||
87 | var xOffset = ((left - canvas.offsetLeft + w/2) - canvas.width/2); | 87 | var xOffset = ((left - canvas.offsetLeft + w/2) - canvas.width/2); |
88 | var yOffset = (canvas.height/2 - (top - canvas.offsetTop + h/2)); | 88 | var yOffset = (canvas.height/2 - (top - canvas.offsetTop + h/2)); |
89 | 89 | ||
90 | var rect = new Rectangle(); | 90 | var rect = Object.create(Rectangle, {}); |
91 | rect.init(world, xOffset, yOffset, w, h, strokeSize, strokeColor, fillColor, | 91 | rect.init(world, xOffset, yOffset, w, h, strokeSize, strokeColor, fillColor, |
92 | tlRadius, trRadius, blRadius, brRadius, strokeMaterial, fillMaterial, strokeStyle); | 92 | tlRadius, trRadius, blRadius, brRadius, strokeMaterial, fillMaterial, strokeStyle); |
93 | 93 | ||