Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into 3DBugs

Conflicts:
	js/lib/geom/circle.js
	js/lib/geom/rectangle.js

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, {
             var xOffset = ((left - canvas.offsetLeft + w/2) - canvas.width/2);
             var yOffset = (canvas.height/2 - (top - canvas.offsetTop + h/2));
 
-            var line = new Line(world, xOffset, yOffset, w, h, slope, strokeSize, strokeColor, strokeMaterial, strokeStyle, xAdj, yAdj);
+            var line = Object.create(Line, {});
+            line.init(world, xOffset, yOffset, w, h, slope, strokeSize, strokeColor, strokeMaterial, strokeStyle, xAdj, yAdj);
 
             world.addObject(line);
             world.render();