diff options
| author | Pushkar Joshi | 2012-04-04 15:55:48 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-04-04 15:55:48 -0700 |
| commit | 0681b34b506767b6caf2816b9096bc1a57a17a2d (patch) | |
| tree | 20f10c767efe8d9c5c38fbc2cdb713d093bb279d /js/tools/BrushTool.js | |
| parent | f4eccf3e7cb76a14a3546a646575162dbd831538 (diff) | |
| parent | 8482e23cd9b8c4700b5130f2588e5eb24d376536 (diff) | |
| download | ninja-0681b34b506767b6caf2816b9096bc1a57a17a2d.tar.gz | |
Merge branch 'master' into pentool
Conflicts:
js/tools/PenTool.js
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 78d1e7e6..620376ab 100644 --- a/js/tools/BrushTool.js +++ b/js/tools/BrushTool.js | |||
| @@ -305,7 +305,7 @@ exports.BrushTool = Montage.create(ShapeTool, { | |||
| 305 | if (!canvas) { | 305 | if (!canvas) { |
| 306 | var newCanvas = NJUtils.makeNJElement("canvas", "Brushstroke", "shape", {"data-RDGE-id": NJUtils.generateRandom()}, true); | 306 | var newCanvas = NJUtils.makeNJElement("canvas", "Brushstroke", "shape", {"data-RDGE-id": NJUtils.generateRandom()}, true); |
| 307 | var elementModel = TagTool.makeElement(w, h, planeMat, midPt, newCanvas); | 307 | var elementModel = TagTool.makeElement(w, h, planeMat, midPt, newCanvas); |
| 308 | ElementMediator.addElement(newCanvas, elementModel.data, true); | 308 | ElementMediator.addElements(newCanvas, elementModel.data, false); |
| 309 | 309 | ||
| 310 | // create all the GL stuff | 310 | // create all the GL stuff |
| 311 | var world = this.getGLWorld(newCanvas, this._useWebGL); | 311 | var world = this.getGLWorld(newCanvas, this._useWebGL); |