Merge branch 'master' into pentool

1 files changed, 3 insertions, 3 deletions

diff --git a/js/tools/PenTool.js b/js/tools/PenTool.js
index 0cfc9331..cc8ec394 100755
--- a/js/tools/PenTool.js
+++ b/js/tools/PenTool.js
@@ -315,7 +315,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 {
@@ -323,7 +323,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 {
@@ -701,7 +701,7 @@ exports.PenTool = Montage.create(ShapeTool, {
                     var strokeColor = subpath.getStrokeColor();
                     newCanvas.elementModel.shapeModel.stroke = strokeColor;
                     if(strokeColor) {
-                        newCanvas.elementModel.shapeModel.border = this.application.ninja.colorController.colorToolbar.stroke;
+                        newCanvas.elementModel.shapeModel.border = this.options.stroke;
                     }
                     newCanvas.elementModel.shapeModel.GLGeomObj = subpath;
                     newCanvas.elementModel.shapeModel.useWebGl = false;//this.options.use3D;