diff options
| author | Mike Krus <mike.krus@kdab.com> | 2020-03-10 22:07:00 +0000 |
|---|---|---|
| committer | Mike Krus <mike.krus@kdab.com> | 2020-03-10 22:07:37 +0000 |
| commit | 17f4f0f5f0407032c205c0efa0e08275470867da (patch) | |
| tree | ebcc94d35919ea5421d2a35ff15aa0fb961cead8 /src/render/backend/cameralens.cpp | |
| parent | 21cd6cb494c7a7b75081cc87ab14c8a6326eeb78 (diff) | |
| parent | 707cfb5884b0a2dacde9b3a7ce47707a5c09744b (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ida354e9c302ef968fbae78edd60a1ad1fabef477
Diffstat (limited to 'src/render/backend/cameralens.cpp')
| -rw-r--r-- | src/render/backend/cameralens.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/render/backend/cameralens.cpp b/src/render/backend/cameralens.cpp index 3e0e4626d..c635ddb61 100644 --- a/src/render/backend/cameralens.cpp +++ b/src/render/backend/cameralens.cpp @@ -48,6 +48,7 @@ #include <Qt3DRender/private/sphere_p.h> #include <Qt3DRender/private/computefilteredboundingvolumejob_p.h> #include <Qt3DRender/private/renderlogging_p.h> +#include <Qt3DRender/private/qrenderaspect_p.h> #include <Qt3DCore/qentity.h> #include <Qt3DCore/qtransform.h> #include <Qt3DCore/private/qaspectmanager_p.h> @@ -167,7 +168,7 @@ void CameraLens::computeSceneBoundingVolume(QNodeId entityId, Entity *camNode = nodeManagers->renderNodesManager()->lookupResource(cameraId); ComputeFilteredBoundingVolumeJobPtr job(new GetBoundingVolumeWithoutCameraJob(this, requestId)); - job->addDependency(m_renderer->expandBoundingVolumeJob()); + job->addDependency(QRenderAspectPrivate::get(m_renderer->aspect())->m_expandBoundingVolumeJob); job->setRoot(root); job->setManagers(nodeManagers); job->ignoreSubTree(camNode); |