Merge branch 'master' into pentool

1 files changed, 5 insertions, 4 deletions

diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js
index 5941b464..b2b48383 100755
--- a/js/tools/LineTool.js
+++ b/js/tools/LineTool.js
@@ -44,8 +44,8 @@ exports.LineTool = Montage.create(ShapeTool, {
             }
 
             this._strokeSize = ShapesController.GetValueInPixels(this.options.strokeSize.value, this.options.strokeSize.units, null);
-                        if (this.application.ninja.colorController.colorToolbar.stroke.color)
-                                this._strokeColor = this.application.ninja.colorController.colorToolbar.stroke.color.css;
+            if (this.options.stroke.color)
+                this._strokeColor = this.options.stroke.color.css;
                         else
                                 this._strokeColor = [0,0,0,1];
             this.startDraw(event);
@@ -215,7 +215,7 @@ exports.LineTool = Montage.create(ShapeTool, {
             var left = Math.round(midPt[0] - 0.5*w);
             var top = Math.round(midPt[1] - 0.5*h);
 
-            var strokeColor = this.application.ninja.colorController.colorToolbar.stroke.webGlColor;
+            var strokeColor = this.options.stroke.webGlColor;
             // for default stroke and fill/no materials
             var strokeMaterial = null;
 
@@ -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();