diff options
author | hwc487 | 2012-05-11 11:28:15 -0700 |
---|---|---|
committer | hwc487 | 2012-05-11 11:28:15 -0700 |
commit | 634194bf87744dd6f693380ec878cc5dd42207a1 (patch) | |
tree | 9652bf677abb71b56582deb9c46fb2dcb7d9a687 /js/tools/RectTool.js | |
parent | d1bcb47ba34f2f2b8db5fa310a9e9a9bd7973988 (diff) | |
parent | e2ef92008a39a67d4f7db0627c7352bdc06ed476 (diff) | |
download | ninja-634194bf87744dd6f693380ec878cc5dd42207a1.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into 3DBugs
Conflicts:
js/lib/geom/circle.js
js/lib/geom/rectangle.js
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 | ||