From 03a8af76e3c3d41508cba17eb2b5eebb5ebf66c1 Mon Sep 17 00:00:00 2001 From: howard-stearns Date: Wed, 14 Sep 2016 12:02:33 -0700 Subject: [PATCH] don't do hand-controller edit object-selection when pointed at a HUD element --- scripts/system/libraries/entitySelectionTool.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/system/libraries/entitySelectionTool.js b/scripts/system/libraries/entitySelectionTool.js index 461204b7aa..9d98a19305 100644 --- a/scripts/system/libraries/entitySelectionTool.js +++ b/scripts/system/libraries/entitySelectionTool.js @@ -1022,6 +1022,9 @@ SelectionDisplay = (function() { // No switching while the other is already triggered, so no need to release. activeHand = (activeHand === Controller.Standard.RightHand) ? Controller.Standard.LeftHand : Controller.Standard.RightHand; } + if (Reticle.pointingAtSystemOverlay || Overlays.getOverlayAtPoint(Reticle.position)) { + return; + } var eventResult = that.mousePressEvent({}); if (!eventResult || (eventResult === 'selectionBox')) { var pickRay = controllerComputePickRay();