don't accidently select entities through edit.js window

This commit is contained in:
Seth Alves 2016-09-14 10:25:30 -07:00
parent e6a1c14de6
commit b48270c9a7

View file

@ -1029,7 +1029,9 @@ SelectionDisplay = (function() {
var entityIntersection = Entities.findRayIntersection(pickRay, true);
var overlayIntersection = Overlays.findRayIntersection(pickRay);
if (entityIntersection.intersects &&
(!overlayIntersection.intersects || (entityIntersection.distance < overlayIntersection.distance))) {
(!overlayIntersection.intersects ||
(entityIntersection.distance < overlayIntersection.distance)) &&
(!(Reticle.pointingAtSystemOverlay || Overlays.getOverlayAtPoint(Reticle.position)))) {
selectionManager.setSelections([entityIntersection.entityID]);
}
}