diff options
Diffstat (limited to 'js/tools/LineTool.js')
-rwxr-xr-x | js/tools/LineTool.js | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js index a61f8f79..a43d4fb6 100755 --- a/js/tools/LineTool.js +++ b/js/tools/LineTool.js | |||
@@ -216,6 +216,7 @@ exports.LineTool = Montage.create(ShapeTool, { | |||
216 | { | 216 | { |
217 | strokeMaterial = Object.create(MaterialsModel.getMaterial(strokeM)); | 217 | strokeMaterial = Object.create(MaterialsModel.getMaterial(strokeM)); |
218 | } | 218 | } |
219 | strokeColor = ShapesController.getMaterialColor(strokeM) || strokeColor; | ||
219 | } | 220 | } |
220 | 221 | ||
221 | var world = this.getGLWorld(canvas, this.options.use3D); | 222 | var world = this.getGLWorld(canvas, this.options.use3D); |
@@ -234,19 +235,13 @@ exports.LineTool = Montage.create(ShapeTool, { | |||
234 | canvas.elementModel.selection = "Line"; | 235 | canvas.elementModel.selection = "Line"; |
235 | canvas.elementModel.pi = "LinePi"; | 236 | canvas.elementModel.pi = "LinePi"; |
236 | canvas.elementModel.shapeModel.strokeSize = this.options.strokeSize.value + " " + this.options.strokeSize.units; | 237 | canvas.elementModel.shapeModel.strokeSize = this.options.strokeSize.value + " " + this.options.strokeSize.units; |
237 | canvas.elementModel.shapeModel.stroke = strokeColor; | ||
238 | if(strokeColor) | ||
239 | { | ||
240 | canvas.elementModel.shapeModel.border = this.application.ninja.colorController.colorToolbar.stroke; | ||
241 | } | ||
242 | |||
243 | canvas.elementModel.shapeModel.strokeMaterial = strokeMaterial; | ||
244 | 238 | ||
245 | canvas.elementModel.shapeModel.strokeStyleIndex = strokeStyleIndex; | 239 | canvas.elementModel.shapeModel.strokeStyleIndex = strokeStyleIndex; |
246 | canvas.elementModel.shapeModel.strokeStyle = strokeStyle; | 240 | canvas.elementModel.shapeModel.strokeStyle = strokeStyle; |
247 | 241 | ||
248 | canvas.elementModel.shapeModel.GLGeomObj = line; | 242 | canvas.elementModel.shapeModel.GLGeomObj = line; |
249 | canvas.elementModel.shapeModel.useWebGl = this.options.use3D; | 243 | canvas.elementModel.shapeModel.useWebGl = this.options.use3D; |
244 | canvas.elementModel.shapeModel.slope = slope; | ||
250 | } | 245 | } |
251 | else | 246 | else |
252 | { | 247 | { |