aboutsummaryrefslogtreecommitdiff
path: root/js/tools/LineTool.js
diff options
context:
space:
mode:
authorEric Guzman2012-02-08 15:33:30 -0800
committerEric Guzman2012-02-08 15:33:30 -0800
commit4ab650bccc776b031191dc410a93309a9d342bab (patch)
tree55a2c7cdda8cce2ede9a8efcb3e77bfa96abc821 /js/tools/LineTool.js
parent7fc8ce44579b0464710d0696782daf7df776b1a0 (diff)
parent0537f8f29e7b8dd48fd08f20b1533fbe92a54c4b (diff)
downloadninja-4ab650bccc776b031191dc410a93309a9d342bab.tar.gz
Merge branch 'refs/heads/master' into PresetsPanel
Diffstat (limited to 'js/tools/LineTool.js')
-rw-r--r--js/tools/LineTool.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js
index 17157f23..99c374a7 100644
--- a/js/tools/LineTool.js
+++ b/js/tools/LineTool.js
@@ -203,10 +203,10 @@ exports.LineTool = Montage.create(ShapeTool, {
203 // for default stroke and fill/no materials 203 // for default stroke and fill/no materials
204 var strokeMaterial = null; 204 var strokeMaterial = null;
205 205
206 var strokeIndex = parseInt(this.options.strokeMaterial); 206 var strokeM = this.options.strokeMaterial;
207 if(strokeIndex > 0) 207 if(strokeM)
208 { 208 {
209 strokeMaterial = Object.create(MaterialsLibrary.getMaterialAt(strokeIndex-1)); 209 strokeMaterial = Object.create(MaterialsLibrary.getMaterial(strokeM));
210 } 210 }
211 211
212 var world = this.getGLWorld(canvas, this.options.use3D); 212 var world = this.getGLWorld(canvas, this.options.use3D);
@@ -232,12 +232,12 @@ exports.LineTool = Montage.create(ShapeTool, {
232 } 232 }
233 233
234 canvas.elementModel.shapeModel.strokeMaterial = strokeMaterial; 234 canvas.elementModel.shapeModel.strokeMaterial = strokeMaterial;
235 canvas.elementModel.shapeModel.strokeMaterialIndex = strokeIndex;
236 235
237 canvas.elementModel.shapeModel.strokeStyleIndex = strokeStyleIndex; 236 canvas.elementModel.shapeModel.strokeStyleIndex = strokeStyleIndex;
238 canvas.elementModel.shapeModel.strokeStyle = strokeStyle; 237 canvas.elementModel.shapeModel.strokeStyle = strokeStyle;
239 238
240 canvas.elementModel.shapeModel.GLGeomObj = line; 239 canvas.elementModel.shapeModel.GLGeomObj = line;
240 canvas.elementModel.shapeModel.useWebGl = this.options.use3D;
241 } 241 }
242 else 242 else
243 { 243 {