Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 07:47:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #7925 from sethalves/overlay-or-grab-not-both

Browse source 
fix mouse-grab moving both an overlay and an entity at the same time
This commit is contained in:
Brad Hefta-Gaub 2016-05-19 17:38:32 -07:00
commit 8ff7af28be
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
scripts/system/controllers/grab.js
View file

@ -316,7 +316,12 @@ Grabber.prototype.pressEvent = function(event) {
return;
}
if (event.isLeftButton!==true ||event.isRightButton===true || event.isMiddleButton===true) {
if (event.isLeftButton !== true || event.isRightButton === true || event.isMiddleButton === true) {
return;
}
if (Overlays.getOverlayAtPoint(Reticle.position) > 0) {
// the mouse is pointing at an overlay; don't look for entities underneath the overlay.
return;
}