diff options
| author | Eric Guzman | 2012-04-04 11:42:23 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-04-04 11:42:23 -0700 |
| commit | c394a1cf04bbf3b9ad3003ec86498a30d00926bb (patch) | |
| tree | 52c2b672734d4112f101ec3c8e8e2a61f18ebd4f /js/tools/BrushTool.js | |
| parent | 2a5374af0b06e0402498b61985fd3c67d063729b (diff) | |
| parent | a11ef2eed7049835c8bdfa50a2b893632c46eaa0 (diff) | |
| download | ninja-c394a1cf04bbf3b9ad3003ec86498a30d00926bb.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
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); |