summaryrefslogtreecommitdiffstats
path: root/src/render/jobs/raycastingjob.cpp
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2019-04-25 15:27:11 +0200
committerPaul Lemire <paul.lemire@kdab.com>2019-04-26 07:14:12 +0200
commit06f41f15abaacc9f6f7acb8e51d2cfb68705a924 (patch)
tree210403f4bb9872940f8db4ab656238e9f14e1b98 /src/render/jobs/raycastingjob.cpp
parent9b140ccba930f159443a70a81eb1d2585b6070f9 (diff)
parentfed848f7dcff99cf5adb3b7b45190826b3dcf898 (diff)
Merge remote-tracking branch 5.12 into 5.13
Diffstat (limited to 'src/render/jobs/raycastingjob.cpp')
-rw-r--r--src/render/jobs/raycastingjob.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/render/jobs/raycastingjob.cpp b/src/render/jobs/raycastingjob.cpp
index 70c7ac374..887f203bf 100644
--- a/src/render/jobs/raycastingjob.cpp
+++ b/src/render/jobs/raycastingjob.cpp
@@ -164,8 +164,11 @@ bool RayCastingJob::runHelper()
rays.back().transform(*pair.first->worldTransform());
break;
case QAbstractRayCasterPrivate::ScreenScapeRayCaster:
- for (const PickingUtils::ViewportCameraAreaDetails &vca : vcaDetails)
- rays << rayForViewportAndCamera(vca, nullptr, pair.second->position());
+ for (const PickingUtils::ViewportCameraAreaDetails &vca : vcaDetails) {
+ auto ray = rayForViewportAndCamera(vca, nullptr, pair.second->position());
+ if (ray.isValid())
+ rays << ray;
+ }
break;
default:
Q_UNREACHABLE();