Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 18:25:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge from upstream

Browse source
This commit is contained in:
Seth Alves 2016-09-20 13:32:05 -07:00
parent 2468b56079
commit 2e83f21844
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/system/libraries/entitySelectionTool.js
View file

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