aboutsummaryrefslogtreecommitdiff
path: root/js/tools/PenTool.js
diff options
context:
space:
mode:
authorAnanya Sen2012-05-31 10:13:40 -0700
committerAnanya Sen2012-05-31 10:13:40 -0700
commit286457b4f23974277274ba388afd283e8aa085cb (patch)
treec21bf791e7c4f572d12f97987ea6b89e74da67fe /js/tools/PenTool.js
parent4d9b481c58090e8f1fc7b0e9d73a81b0f49cccc8 (diff)
parentd49c909cff7f0c5e5d0b127ad84a2fefc6677dc6 (diff)
downloadninja-286457b4f23974277274ba388afd283e8aa085cb.tar.gz
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Conflicts: js/controllers/styles-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/tools/PenTool.js')
-rwxr-xr-xjs/tools/PenTool.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/js/tools/PenTool.js b/js/tools/PenTool.js
index 16990ca7..10eb03c9 100755
--- a/js/tools/PenTool.js
+++ b/js/tools/PenTool.js
@@ -240,7 +240,7 @@ exports.PenTool = Montage.create(ShapeTool, {
240 this._selectedSubpath.setStrokeWidth(strokeSize); 240 this._selectedSubpath.setStrokeWidth(strokeSize);
241 241
242 var colorArray=[]; 242 var colorArray=[];
243 var color = this.application.ninja.colorController.colorToolbar.stroke.color; 243 var color = this.options.stroke.color;
244 if (color){ 244 if (color){
245 colorArray = [color.r/255, color.g/255, color.b/255, color.a]; 245 colorArray = [color.r/255, color.g/255, color.b/255, color.a];
246 }else { 246 }else {
@@ -248,7 +248,7 @@ exports.PenTool = Montage.create(ShapeTool, {
248 } 248 }
249 this._selectedSubpath.setStrokeColor(colorArray); 249 this._selectedSubpath.setStrokeColor(colorArray);
250 250
251 color = this.application.ninja.colorController.colorToolbar.fill.color; 251 color = this.options.fill.color;
252 if (color){ 252 if (color){
253 colorArray = [color.r/255, color.g/255, color.b/255, color.a]; 253 colorArray = [color.r/255, color.g/255, color.b/255, color.a];
254 } else { 254 } else {
@@ -592,7 +592,7 @@ exports.PenTool = Montage.create(ShapeTool, {
592 var strokeColor = subpath.getStrokeColor(); 592 var strokeColor = subpath.getStrokeColor();
593 newCanvas.elementModel.shapeModel.stroke = strokeColor; 593 newCanvas.elementModel.shapeModel.stroke = strokeColor;
594 if(strokeColor) { 594 if(strokeColor) {
595 newCanvas.elementModel.shapeModel.border = this.application.ninja.colorController.colorToolbar.stroke; 595 newCanvas.elementModel.shapeModel.border = this.options.stroke;
596 } 596 }
597 newCanvas.elementModel.shapeModel.GLGeomObj = subpath; 597 newCanvas.elementModel.shapeModel.GLGeomObj = subpath;
598 newCanvas.elementModel.shapeModel.useWebGl = false;//this.options.use3D; 598 newCanvas.elementModel.shapeModel.useWebGl = false;//this.options.use3D;