summaryrefslogtreecommitdiffstats
path: root/src/render/jobs/raycastingjob.cpp
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2021-07-29 15:19:59 +0200
committerPaul Lemire <paul.lemire@kdab.com>2021-08-09 10:22:05 +0200
commit406ea4134444a05dd89f215b3144181c0b0ce924 (patch)
tree8df7212cd2e6a1bd9c9a5f1b7817fcaeaca459bd /src/render/jobs/raycastingjob.cpp
parente354c455f50a2d4ebc317fc805159cce43329c10 (diff)
Picking: reuse LayerFilterJob to perform layer filtering
This fixes picking for cases where multiple LayerFilters using different filter modes are present in the FrameGraph. This also reduces code duplication. Pick-to: 6.2 6.1 5.15 Change-Id: I19d0c2c5777930820ab950cbf2bfe08ef7d2484f Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'src/render/jobs/raycastingjob.cpp')
-rw-r--r--src/render/jobs/raycastingjob.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/render/jobs/raycastingjob.cpp b/src/render/jobs/raycastingjob.cpp
index 7c7ddc71a..b6ebdad99 100644
--- a/src/render/jobs/raycastingjob.cpp
+++ b/src/render/jobs/raycastingjob.cpp
@@ -201,7 +201,7 @@ bool RayCastingJob::pick(const QList<QPair<Entity *, RayCaster *>> &entities)
for (const QRay3D &ray: qAsConst(rays)) {
PickingUtils::HitList sphereHits;
PickingUtils::HierarchicalEntityPicker entityPicker(ray, false);
- entityPicker.setFilterLayers(pair.second->layerIds(), pair.second->filterMode());
+ entityPicker.setLayerIds(pair.second->layerIds(), pair.second->filterMode());
if (entityPicker.collectHits(m_manager, m_node)) {
if (pickConfiguration.trianglePickingRequested) {
PickingUtils::TriangleCollisionGathererFunctor gathererFunctor;