diff options
| author | Valerio Virgillito | 2012-04-04 13:27:40 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-04-04 13:27:40 -0700 |
| commit | 9f1806a7134ec4744a8009e6a7467f5cea04cabf (patch) | |
| tree | b4038b10cb105cc9860f869e6bb372a74b05813c /js/tools/BrushTool.js | |
| parent | 56a042a8ed5d1cb2cb82781952f09ffd6a8338ea (diff) | |
| parent | 8482e23cd9b8c4700b5130f2588e5eb24d376536 (diff) | |
| download | ninja-9f1806a7134ec4744a8009e6a7467f5cea04cabf.tar.gz | |
Merge branch 'refs/heads/master' into components
Diffstat (limited to 'js/tools/BrushTool.js')
| -rw-r--r-- | js/tools/BrushTool.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/tools/BrushTool.js b/js/tools/BrushTool.js index f7f0e4bf..2171d2c6 100644 --- a/js/tools/BrushTool.js +++ b/js/tools/BrushTool.js | |||
| @@ -306,7 +306,7 @@ exports.BrushTool = Montage.create(ShapeTool, { | |||
| 306 | if (!canvas) { | 306 | if (!canvas) { |
| 307 | var newCanvas = NJUtils.makeNJElement("canvas", "Brushstroke", "shape", {"data-RDGE-id": NJUtils.generateRandom()}, true); | 307 | var newCanvas = NJUtils.makeNJElement("canvas", "Brushstroke", "shape", {"data-RDGE-id": NJUtils.generateRandom()}, true); |
| 308 | var elementModel = TagTool.makeElement(w, h, planeMat, midPt, newCanvas); | 308 | var elementModel = TagTool.makeElement(w, h, planeMat, midPt, newCanvas); |
| 309 | ElementMediator.addElement(newCanvas, elementModel.data, true); | 309 | ElementMediator.addElements(newCanvas, elementModel.data, false); |
| 310 | 310 | ||
| 311 | // create all the GL stuff | 311 | // create all the GL stuff |
| 312 | var world = this.getGLWorld(newCanvas, this._useWebGL); | 312 | var world = this.getGLWorld(newCanvas, this._useWebGL); |