Merge remote-tracking branch 'origin/5.12' into dev

 Conflicts:
	src/render/renderers/opengl/textures/gltexture.cpp

Change-Id: I57e9a296dc15f0b5dc3af3664f698bdc799c4bb5

1 files changed, 7 insertions, 1 deletions

diff --git a/src/render/jobs/pickboundingvolumejob.cpp b/src/render/jobs/pickboundingvolumejob.cpp
index 2f1eb4cd8..2050b8772 100644
--- a/src/render/jobs/pickboundingvolumejob.cpp
+++ b/src/render/jobs/pickboundingvolumejob.cpp
@@ -232,8 +232,14 @@ bool PickBoundingVolumeJob::runHelper()
         for (const PickingUtils::ViewportCameraAreaDetails &vca : vcaDetails) {
             PickingUtils::HitList sphereHits;
             QRay3D ray = rayForViewportAndCamera(vca, event.first, event.second.pos());
-            if (!ray.isValid())
+            if (!ray.isValid()) {
+                // An invalid rays is when we've lost our surface or the mouse
+                // has moved out of the viewport In case of a button released
+                // outside of the viewport, we still want to notify the
+                // lastCurrent entity about this.
+                dispatchPickEvents(event.second, PickingUtils::HitList(), eventButton, eventButtons, eventModifiers, allHitsRequested);
                 continue;
+            }
 
             PickingUtils::HierarchicalEntityPicker entityPicker(ray);
             if (entityPicker.collectHits(m_manager, m_node)) {