From 6414fcaae568b31e43c89b72bbc7405d4eb5e88a Mon Sep 17 00:00:00 2001
From: Dante Ruiz <danteruiz102@gmail.com>
Date: Fri, 4 May 2018 14:20:17 -0700
Subject: [PATCH 1/2] fix-another-highlighting-issue

---
 .../controllerModules/highlightNearbyEntities.js      | 11 ++++++++++-
 .../controllers/controllerModules/inEditMode.js       |  1 +
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/scripts/system/controllers/controllerModules/highlightNearbyEntities.js b/scripts/system/controllers/controllerModules/highlightNearbyEntities.js
index 32e1b4300d..bc09ebee7a 100644
--- a/scripts/system/controllers/controllerModules/highlightNearbyEntities.js
+++ b/scripts/system/controllers/controllerModules/highlightNearbyEntities.js
@@ -56,6 +56,12 @@
             return canGrabEntity;
         };
 
+        this.clearAll = function() {
+            this.highlightedEntities.forEach(function(entity) {
+                dispatcherUtils.unhighlightTargetEntity(entity);
+            });
+        };
+
         this.hasHyperLink = function(props) {
             return (props.href !== "" && props.href !== undefined);
         };
@@ -121,7 +127,6 @@
             if (channel === 'Hifi-unhighlight-entity') {
                 try {
                     data = JSON.parse(message);
-
                     var hand = data.hand;
                     if (hand === dispatcherUtils.LEFT_HAND) {
                         leftHighlightNearbyEntities.removeEntityFromHighlightList(data.entityID);
@@ -131,6 +136,9 @@
                 } catch (e) {
                     print("Failed to parse message");
                 }
+            } else if (channel === 'Hifi-unhighlight-all') {
+                leftHighlightNearbyEntities.clearAll();
+                rightHighlightNearbyEntities.clearAll();
             }
         }
     };
@@ -145,6 +153,7 @@
         dispatcherUtils.disableDispatcherModule("RightHighlightNearbyEntities");
     }
     Messages.subscribe('Hifi-unhighlight-entity');
+    Messages.subscribe('Hifi-unhighlight-all');
     Messages.messageReceived.connect(handleMessage);
     Script.scriptEnding.connect(cleanup);
 }());
diff --git a/scripts/system/controllers/controllerModules/inEditMode.js b/scripts/system/controllers/controllerModules/inEditMode.js
index f7e86f9042..3ad7902d71 100644
--- a/scripts/system/controllers/controllerModules/inEditMode.js
+++ b/scripts/system/controllers/controllerModules/inEditMode.js
@@ -78,6 +78,7 @@ Script.include("/~/system/libraries/utils.js");
                 if (controllerData.triggerValues[this.hand] < TRIGGER_ON_VALUE) {
                     this.triggerClicked = false;
                 }
+                Messages.sendLocalMessage('Hifi-unhighlight-all', '');
                 return makeRunningValues(true, [], []);
             }
             this.triggerClicked = false;

From a593209ec132ee828f454d6f505ee7ee9cc0ea38 Mon Sep 17 00:00:00 2001
From: Dante Ruiz <danteruiz102@gmail.com>
Date: Mon, 7 May 2018 15:30:17 -0700
Subject: [PATCH 2/2] remove highlight when point to the sky

---
 .../controllers/controllerModules/farActionGrabEntity.js       | 3 +++
 .../controllers/controllerModules/mouseHighlightEntities.js    | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/scripts/system/controllers/controllerModules/farActionGrabEntity.js b/scripts/system/controllers/controllerModules/farActionGrabEntity.js
index cc884cdbc7..66cd197abd 100644
--- a/scripts/system/controllers/controllerModules/farActionGrabEntity.js
+++ b/scripts/system/controllers/controllerModules/farActionGrabEntity.js
@@ -564,6 +564,9 @@ Script.include("/~/system/libraries/Xform.js");
                     }
                 } else if (this.distanceRotating) {
                     this.distanceRotate(otherFarGrabModule);
+                } else if (this.highlightedEntity) {
+                    Selection.removeFromSelectedItemsList(DISPATCHER_HOVERING_LIST, "entity", this.highlightedEntity);
+                    this.highlightedEntity = null;
                 }
             }
             return this.exitIfDisabled(controllerData);
diff --git a/scripts/system/controllers/controllerModules/mouseHighlightEntities.js b/scripts/system/controllers/controllerModules/mouseHighlightEntities.js
index 3180e58e2c..ac57c8691f 100644
--- a/scripts/system/controllers/controllerModules/mouseHighlightEntities.js
+++ b/scripts/system/controllers/controllerModules/mouseHighlightEntities.js
@@ -63,6 +63,9 @@
                             this.highlightedEntity = targetEntityID;
                         }
                     }
+                } else if (this.highlightedEntity) {
+                    dispatcherUtils.unhighlightTargetEntity(this.highlightedEntity);
+                    this.highlightedEntity = null;
                 }
             }