From 2e83f218449499f243091310c1d9989ced0b51bc Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Tue, 20 Sep 2016 13:32:05 -0700
Subject: [PATCH] merge from upstream

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

diff --git a/scripts/system/libraries/entitySelectionTool.js b/scripts/system/libraries/entitySelectionTool.js
index 25bd0bd495..9d98a19305 100644
--- a/scripts/system/libraries/entitySelectionTool.js
+++ b/scripts/system/libraries/entitySelectionTool.js
@@ -1032,9 +1032,7 @@ SelectionDisplay = (function() {
                         var entityIntersection = Entities.findRayIntersection(pickRay, true);
                         var overlayIntersection = Overlays.findRayIntersection(pickRay);
                         if (entityIntersection.intersects &&
-                            (!overlayIntersection.intersects ||
-                             (entityIntersection.distance < overlayIntersection.distance)) &&
-                            (!(Reticle.pointingAtSystemOverlay || Overlays.getOverlayAtPoint(Reticle.position)))) {
+                            (!overlayIntersection.intersects || (entityIntersection.distance < overlayIntersection.distance))) {
                             selectionManager.setSelections([entityIntersection.entityID]);
                         }
                     }