Merge branch 'refs/heads/NINJA-master' into TimelineUber

Conflicts:
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
	js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css

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

1 files changed, 0 insertions, 3 deletions

diff --git a/js/tools/modifier-tool-base.js b/js/tools/modifier-tool-base.js
index 9b855e66..c772e36c 100755
--- a/js/tools/modifier-tool-base.js
+++ b/js/tools/modifier-tool-base.js
@@ -480,7 +480,6 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
             if(this._target)
             {
                 this.isDrawing = true;
-                this.application.ninja.stage.showSelectionBounds = false;
                 this._updateTargets();
 
                 if(this._canSnap)
@@ -798,7 +797,6 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
                 if(len === 1)
                 {
                     this.target = this.application.ninja.selectedElements[0];
-                    drawUtils.addElement(this.target);
                 }
                 else
                 {
@@ -882,7 +880,6 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
                                                                     new WebKitPoint(event.pageX, event.pageY));
 
             this.isDrawing = false;
-            this.application.ninja.stage.showSelectionBounds = true;
             if(this._escape) {
                 this._escape = false;
                 return;