diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2019-06-03 12:29:29 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-06-03 12:29:52 +0200 |
| commit | 4eee1ab5a51ac482e2252e2e85c0fe624d5d4bad (patch) | |
| tree | 71fb24fc69b2f77e08a57c56011ee5b72f23a52a /tests/auto/render/proximityfiltering/tst_proximityfiltering.cpp | |
| parent | 79aa74b5d9df52605a8833e3853b422ca8e7a651 (diff) | |
| parent | 666a645d1edc98dfea92fdaf7eaeed10c86dbc56 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/render/renderers/opengl/renderer/renderer.cpp
tests/auto/render/textures/tst_textures.cpp
Change-Id: I4da0eafe7ddd4dd822c3dcb5f5fa826653a335b4
Diffstat (limited to 'tests/auto/render/proximityfiltering/tst_proximityfiltering.cpp')
| -rw-r--r-- | tests/auto/render/proximityfiltering/tst_proximityfiltering.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/render/proximityfiltering/tst_proximityfiltering.cpp b/tests/auto/render/proximityfiltering/tst_proximityfiltering.cpp index 7bb3c16a7..c8d862b2e 100644 --- a/tests/auto/render/proximityfiltering/tst_proximityfiltering.cpp +++ b/tests/auto/render/proximityfiltering/tst_proximityfiltering.cpp @@ -253,10 +253,12 @@ private Q_SLOTS: Qt3DRender::Render::UpdateTreeEnabledJob updateTreeEnabledJob; updateTreeEnabledJob.setRoot(backendRoot); + updateTreeEnabledJob.setManagers(aspect->nodeManagers()); updateTreeEnabledJob.run(); Qt3DRender::Render::UpdateWorldTransformJob updateWorldTransform; updateWorldTransform.setRoot(backendRoot); + updateWorldTransform.setManagers(aspect->nodeManagers()); updateWorldTransform.run(); Qt3DRender::Render::CalculateBoundingVolumeJob calcBVolume; @@ -270,6 +272,7 @@ private Q_SLOTS: Qt3DRender::Render::ExpandBoundingVolumeJob expandBVolume; expandBVolume.setRoot(backendRoot); + expandBVolume.setManagers(aspect->nodeManagers()); expandBVolume.run(); // WHEN |