5 files changed, 10 insertions, 10 deletions

diff --git a/js/tools/BrushTool.js b/js/tools/BrushTool.js
index ded56ecc..7e5e0630 100644
--- a/js/tools/BrushTool.js
+++ b/js/tools/BrushTool.js
@@ -132,7 +132,7 @@ exports.BrushTool = Montage.create(ShapeTool, {
              if (this._selectedBrushStroke === null){
                  this._selectedBrushStroke = new BrushStroke();
                  var colorArray=[0,0,0,0];
-                 var color = this.application.ninja.colorController.colorToolbar.fill.color;
+                 var color = this.options.fill.color;
                  if (color){
                      colorArray = [color.r/255, color.g/255, color.b/255, color.a];
                  } else {
diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js
index 3e9167fd..92352880 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);
@@ -214,7 +214,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;
 
diff --git a/js/tools/OvalTool.js b/js/tools/OvalTool.js
index 6edec811..f1da3a46 100755
--- a/js/tools/OvalTool.js
+++ b/js/tools/OvalTool.js
@@ -39,8 +39,8 @@ exports.OvalTool = Montage.create(ShapeTool, {
 
             var innerRadius = this.options.innerRadius.value / 100;
 
-            var strokeColor = this.application.ninja.colorController.colorToolbar.stroke.webGlColor;
-            var fillColor = this.application.ninja.colorController.colorToolbar.fill.webGlColor;
+            var strokeColor = this.options.stroke.webGlColor;
+            var fillColor = this.options.fill.webGlColor;
 
             // for default stroke and fill/no materials
             var strokeMaterial = null;
diff --git a/js/tools/PenTool.js b/js/tools/PenTool.js
index 8ecc9f79..83d0c8d2 100755
--- a/js/tools/PenTool.js
+++ b/js/tools/PenTool.js
@@ -240,7 +240,7 @@ exports.PenTool = Montage.create(ShapeTool, {
                 this._selectedSubpath.setStrokeWidth(strokeSize);
 
                 var colorArray=[];
-                var color = this.application.ninja.colorController.colorToolbar.stroke.color;
+                var color = this.options.stroke.color;
                 if (color){
                     colorArray = [color.r/255, color.g/255, color.b/255, color.a];
                 }else {
@@ -248,7 +248,7 @@ exports.PenTool = Montage.create(ShapeTool, {
                 }
                 this._selectedSubpath.setStrokeColor(colorArray);
 
-                color = this.application.ninja.colorController.colorToolbar.fill.color;
+                color = this.options.fill.color;
                 if (color){
                     colorArray = [color.r/255, color.g/255, color.b/255, color.a];
                 } else {
diff --git a/js/tools/RectTool.js b/js/tools/RectTool.js
index 0c14a559..d4951db8 100755
--- a/js/tools/RectTool.js
+++ b/js/tools/RectTool.js
@@ -59,8 +59,8 @@ exports.RectTool = Montage.create(ShapeTool, {
             var blRadius = ShapesController.GetValueInPixels(this.options.BLRadiusControl.value, this.options.BLRadiusControl.units, h);
             var brRadius = ShapesController.GetValueInPixels(this.options.BRRadiusControl.value, this.options.BRRadiusControl.units, h);
 
-            var strokeColor = this.application.ninja.colorController.colorToolbar.stroke.webGlColor;
-            var fillColor = this.application.ninja.colorController.colorToolbar.fill.webGlColor;
+            var strokeColor = this.options.stroke.webGlColor;
+            var fillColor = this.options.fill.webGlColor;
             // for default stroke and fill/no materials
             var strokeMaterial = null;
             var fillMaterial = null;