From 030e69794584dffd56e11fe0f4069150008d801c Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Mon, 18 Jun 2018 15:55:55 -0700
Subject: [PATCH 1/3] fix toggling to world space

---
 scripts/system/libraries/entitySelectionTool.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/scripts/system/libraries/entitySelectionTool.js b/scripts/system/libraries/entitySelectionTool.js
index 1b41559160..51b94c6dda 100644
--- a/scripts/system/libraries/entitySelectionTool.js
+++ b/scripts/system/libraries/entitySelectionTool.js
@@ -201,8 +201,10 @@ SelectionManager = (function() {
             that.worldRotation = properties.boundingBox.rotation;
 
             that.entityType = properties.type;
-
-            SelectionDisplay.setSpaceMode(SPACE_LOCAL);
+			
+			if (selectionUpdated) {
+				SelectionDisplay.setSpaceMode(SPACE_LOCAL);
+			}
         } else {
             that.localRotation = null;
             that.localDimensions = null;
@@ -1401,7 +1403,7 @@ SelectionDisplay = (function() {
         that.setHandleRotateYawVisible(!activeTool || isActiveTool(handleRotateYawRing));
         that.setHandleRotateRollVisible(!activeTool || isActiveTool(handleRotateRollRing));
 
-        var showScaleStretch = !activeTool && SelectionManager.selections.length === 1;
+        var showScaleStretch = !activeTool && SelectionManager.selections.length === 1 && spaceMode === SPACE_LOCAL;
         that.setHandleStretchXVisible(showScaleStretch || isActiveTool(handleStretchXSphere));
         that.setHandleStretchYVisible(showScaleStretch || isActiveTool(handleStretchYSphere));
         that.setHandleStretchZVisible(showScaleStretch || isActiveTool(handleStretchZSphere));
@@ -2059,7 +2061,7 @@ SelectionDisplay = (function() {
         };
 
         var onMove = function(event) {
-            var proportional = (spaceMode === SPACE_WORLD) || directionEnum === STRETCH_DIRECTION.ALL;
+            var proportional = directionEnum === STRETCH_DIRECTION.ALL;
             
             var position, dimensions, rotation;
             if (spaceMode === SPACE_LOCAL) {

From 5b699d1cd4637d99f3db82202bbaa4713d9bfdab Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Mon, 18 Jun 2018 16:14:46 -0700
Subject: [PATCH 2/3] tabs

---
 scripts/system/libraries/entitySelectionTool.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/system/libraries/entitySelectionTool.js b/scripts/system/libraries/entitySelectionTool.js
index 51b94c6dda..134b1497ca 100644
--- a/scripts/system/libraries/entitySelectionTool.js
+++ b/scripts/system/libraries/entitySelectionTool.js
@@ -201,10 +201,10 @@ SelectionManager = (function() {
             that.worldRotation = properties.boundingBox.rotation;
 
             that.entityType = properties.type;
-			
-			if (selectionUpdated) {
-				SelectionDisplay.setSpaceMode(SPACE_LOCAL);
-			}
+            
+            if (selectionUpdated) {
+                SelectionDisplay.setSpaceMode(SPACE_LOCAL);
+            }
         } else {
             that.localRotation = null;
             that.localDimensions = null;

From e1de226aae68cebf24885606259108526c025889 Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Mon, 2 Jul 2018 11:11:02 -0700
Subject: [PATCH 3/3] change toggle input to t

---
 scripts/system/edit.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index 08e7a541d5..85a2d9a699 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -1784,7 +1784,7 @@ var keyReleaseEvent = function (event) {
         deleteSelectedEntities();
     } else if (event.text === "ESC") {
         selectionManager.clearSelections();
-    } else if (event.text === "TAB") {
+    } else if (event.text === "t") {
         selectionDisplay.toggleSpaceMode();
     } else if (event.text === "f") {
         if (isActive) {