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>

4 files changed, 0 insertions, 7 deletions

diff --git a/js/tools/Rotate3DToolBase.js b/js/tools/Rotate3DToolBase.js
index e36e23c4..545aedad 100755
--- a/js/tools/Rotate3DToolBase.js
+++ b/js/tools/Rotate3DToolBase.js
@@ -485,7 +485,6 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, {
                 if(len === 1)
                 {
                     this.target = this.application.ninja.selectedElements[0];
-                    drawUtils.addElement(this.target);
 
                     viewUtils.pushViewportObj( this.target );
                     var eltCtr = viewUtils.getCenterOfProjection();
diff --git a/js/tools/SelectionTool.js b/js/tools/SelectionTool.js
index 923ed819..a136113b 100755
--- a/js/tools/SelectionTool.js
+++ b/js/tools/SelectionTool.js
@@ -102,7 +102,6 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
             }
 
             this.isDrawing = true;
-            this.application.ninja.stage.showSelectionBounds = false;
 
             this._use3DMode = false;
 
@@ -183,7 +182,6 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
                 point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas, new WebKitPoint(event.pageX, event.pageY));
 
             this.isDrawing = false;
-            this.application.ninja.stage.showSelectionBounds = true;
             if(this._escape) {
                 this._escape = false;
                 this._isSelecting = false;
diff --git a/js/tools/Translate3DToolBase.js b/js/tools/Translate3DToolBase.js
index 57a379e4..b5008666 100755
--- a/js/tools/Translate3DToolBase.js
+++ b/js/tools/Translate3DToolBase.js
@@ -302,7 +302,6 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase,
             if(len) {
                 if(len === 1) {
                     this.target = this.application.ninja.selectedElements[0];
-                    drawUtils.addElement(this.target);
 
                     viewUtils.pushViewportObj( this.target );
                     var eltCtr = viewUtils.getCenterOfProjection();
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;