aboutsummaryrefslogtreecommitdiff
path: root/js/tools/LineTool.js
diff options
context:
space:
mode:
authorhwc4872012-05-11 11:28:15 -0700
committerhwc4872012-05-11 11:28:15 -0700
commit634194bf87744dd6f693380ec878cc5dd42207a1 (patch)
tree9652bf677abb71b56582deb9c46fb2dcb7d9a687 /js/tools/LineTool.js
parentd1bcb47ba34f2f2b8db5fa310a9e9a9bd7973988 (diff)
parente2ef92008a39a67d4f7db0627c7352bdc06ed476 (diff)
downloadninja-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/LineTool.js')
-rwxr-xr-xjs/tools/LineTool.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js
index 5941b464..198d7e69 100755
--- a/js/tools/LineTool.js
+++ b/js/tools/LineTool.js
@@ -234,7 +234,8 @@ exports.LineTool = Montage.create(ShapeTool, {
234 var xOffset = ((left - canvas.offsetLeft + w/2) - canvas.width/2); 234 var xOffset = ((left - canvas.offsetLeft + w/2) - canvas.width/2);
235 var yOffset = (canvas.height/2 - (top - canvas.offsetTop + h/2)); 235 var yOffset = (canvas.height/2 - (top - canvas.offsetTop + h/2));
236 236
237 var line = new Line(world, xOffset, yOffset, w, h, slope, strokeSize, strokeColor, strokeMaterial, strokeStyle, xAdj, yAdj); 237 var line = Object.create(Line, {});
238 line.init(world, xOffset, yOffset, w, h, slope, strokeSize, strokeColor, strokeMaterial, strokeStyle, xAdj, yAdj);
238 239
239 world.addObject(line); 240 world.addObject(line);
240 world.render(); 241 world.render();