Merge branch 'refs/heads/master' into CSSPanelUpdates

1 files changed, 1 insertions, 1 deletions

diff --git a/js/tools/BrushTool.js b/js/tools/BrushTool.js
index 5c334b92..0be378fd 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 {