Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities

This commit is contained in:
Seth Alves 2017-10-04 09:38:33 -07:00
commit 3ec9f0c496

View file

@ -178,7 +178,7 @@
}
var hudRayPick = controllerData.hudRayPicks[this.hand];
var point2d = this.calculateNewReticlePosition(hudRayPick.intersection);
if (!Window.isPointOnDesktopWindow(point2d) && !controllerData.triggerClicks[this.hand]) {
if (!Window.isPointOnDesktopWindow(point2d) && !this.triggerClicked) {
this.exitModule();
return false;
}