Merge branch 'refs/heads/NINJAmaster' into TimelineUber

Conflicts:
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	js/tools/SelectionTool.js

Signed-off-by: Jonathan Duran <jduran@motorola.com>

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, {
                 if (!canvas) {
                     var newCanvas = NJUtils.makeNJElement("canvas", "Brushstroke", "shape", {"data-RDGE-id": NJUtils.generateRandom()}, true);
                     var elementModel = TagTool.makeElement(w, h, planeMat, midPt, newCanvas);
-                    ElementMediator.addElement(newCanvas, elementModel.data, true);
+                    ElementMediator.addElements(newCanvas, elementModel.data, false);
 
                     // create all the GL stuff
                     var world = this.getGLWorld(newCanvas, this._useWebGL);