From 9fe3a823ee3b20774d2ce3190cb5870ce93f2fd0 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Fri, 28 Jul 2017 09:35:29 +1200
Subject: [PATCH] Fix unexpectedly deleting multiple entities

---
 scripts/vr-edit/vr-edit.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/scripts/vr-edit/vr-edit.js b/scripts/vr-edit/vr-edit.js
index bd8af9dabd..a10f99ab77 100644
--- a/scripts/vr-edit/vr-edit.js
+++ b/scripts/vr-edit/vr-edit.js
@@ -255,6 +255,7 @@
             highlightedEntityID = null,  // Root entity of highlighted entity set.
             wasAppScaleWithHandles = false,
             isOtherEditorEditingEntityID = false,
+            wasGripPressed = false,
             hoveredOverlayID = null,
 
             // Position values.
@@ -590,6 +591,7 @@
             }
             startEditing();
             wasAppScaleWithHandles = isAppScaleWithHandles;
+            wasGripPressed = hand.gripPressed();
         }
 
         function updateEditorGrabbing() {
@@ -796,6 +798,7 @@
                         updateState();
                         wasAppScaleWithHandles = isAppScaleWithHandles;
                     }
+                    wasGripPressed = false;
                     break;
                 }
                 if (!hand.valid()) {
@@ -808,8 +811,10 @@
                         setState(EDITOR_SEARCHING);
                     }
                 } else if (hand.gripPressed()) {
-                    selection.deleteEntities();
-                    setState(EDITOR_SEARCHING);
+                    if (!wasGripPressed) {
+                        selection.deleteEntities();
+                        setState(EDITOR_SEARCHING);
+                    }
                 } else {
                     debug(side, "ERROR: Unexpected condition in EDITOR_GRABBING!");
                 }