aboutsummaryrefslogtreecommitdiff
path: root/js/tools/LineTool.js
diff options
context:
space:
mode:
authorJon Reid2012-05-22 10:40:40 -0700
committerJon Reid2012-05-22 10:40:40 -0700
commitd43a3179171a9f82c7a17425ec69ff0a4d571f10 (patch)
tree1c78ccc588f04bac9bff4de82e527a128162cf4f /js/tools/LineTool.js
parent1324301feea23f9d66c9ca2f52e004b552e9ed96 (diff)
parent0b6dfbbc7f6c0a67bd415ee8d64685b3f209edfa (diff)
downloadninja-d43a3179171a9f82c7a17425ec69ff0a4d571f10.tar.gz
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'js/tools/LineTool.js')
-rwxr-xr-xjs/tools/LineTool.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js
index 198d7e69..b2b48383 100755
--- a/js/tools/LineTool.js
+++ b/js/tools/LineTool.js
@@ -44,8 +44,8 @@ exports.LineTool = Montage.create(ShapeTool, {
44 } 44 }
45 45
46 this._strokeSize = ShapesController.GetValueInPixels(this.options.strokeSize.value, this.options.strokeSize.units, null); 46 this._strokeSize = ShapesController.GetValueInPixels(this.options.strokeSize.value, this.options.strokeSize.units, null);
47 if (this.application.ninja.colorController.colorToolbar.stroke.color) 47 if (this.options.stroke.color)
48 this._strokeColor = this.application.ninja.colorController.colorToolbar.stroke.color.css; 48 this._strokeColor = this.options.stroke.color.css;
49 else 49 else
50 this._strokeColor = [0,0,0,1]; 50 this._strokeColor = [0,0,0,1];
51 this.startDraw(event); 51 this.startDraw(event);
@@ -215,7 +215,7 @@ exports.LineTool = Montage.create(ShapeTool, {
215 var left = Math.round(midPt[0] - 0.5*w); 215 var left = Math.round(midPt[0] - 0.5*w);
216 var top = Math.round(midPt[1] - 0.5*h); 216 var top = Math.round(midPt[1] - 0.5*h);
217 217
218 var strokeColor = this.application.ninja.colorController.colorToolbar.stroke.webGlColor; 218 var strokeColor = this.options.stroke.webGlColor;
219 // for default stroke and fill/no materials 219 // for default stroke and fill/no materials
220 var strokeMaterial = null; 220 var strokeMaterial = null;
221 221