From 46c8083fb994abec215a2cb933d8a2276801bf6c Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Wed, 19 Sep 2018 10:13:15 -0700
Subject: [PATCH] only call selectEntity one time per trigger
---
.../controllerModules/inEditMode.js | 27 ++++++++++---------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/scripts/system/controllers/controllerModules/inEditMode.js b/scripts/system/controllers/controllerModules/inEditMode.js
index 2bdd89f141..9f25a1b37c 100644
--- a/scripts/system/controllers/controllerModules/inEditMode.js
+++ b/scripts/system/controllers/controllerModules/inEditMode.js
@@ -73,21 +73,22 @@ Script.include("/~/system/libraries/utils.js");
method: "clearSelection",
hand: hand
}));
+ } else {
+ if (this.selectedTarget.type === Picks.INTERSECTED_ENTITY) {
+ Messages.sendLocalMessage("entityToolUpdates", JSON.stringify({
+ method: "selectEntity",
+ entityID: this.selectedTarget.objectID,
+ hand: hand
+ }));
+ } else if (this.selectedTarget.type === Picks.INTERSECTED_OVERLAY) {
+ Messages.sendLocalMessage("entityToolUpdates", JSON.stringify({
+ method: "selectOverlay",
+ overlayID: this.selectedTarget.objectID,
+ hand: hand
+ }));
+ }
}
}
- if (this.selectedTarget.type === Picks.INTERSECTED_ENTITY) {
- Messages.sendLocalMessage("entityToolUpdates", JSON.stringify({
- method: "selectEntity",
- entityID: this.selectedTarget.objectID,
- hand: hand
- }));
- } else if (this.selectedTarget.type === Picks.INTERSECTED_OVERLAY) {
- Messages.sendLocalMessage("entityToolUpdates", JSON.stringify({
- method: "selectOverlay",
- overlayID: this.selectedTarget.objectID,
- hand: hand
- }));
- }
this.triggerClicked = true;
}