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/raycastingjob | |
| 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/raycastingjob')
| -rw-r--r-- | tests/auto/render/raycastingjob/tst_raycastingjob.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/render/raycastingjob/tst_raycastingjob.cpp b/tests/auto/render/raycastingjob/tst_raycastingjob.cpp index 411bb9160..9477947ac 100644 --- a/tests/auto/render/raycastingjob/tst_raycastingjob.cpp +++ b/tests/auto/render/raycastingjob/tst_raycastingjob.cpp @@ -113,6 +113,7 @@ void runRequiredJobs(Qt3DRender::TestAspect *test) Qt3DRender::Render::UpdateWorldTransformJob updateWorldTransform; updateWorldTransform.setRoot(test->sceneRoot()); + updateWorldTransform.setManagers(test->nodeManagers()); updateWorldTransform.run(); // For each buffer @@ -134,6 +135,7 @@ void runRequiredJobs(Qt3DRender::TestAspect *test) Qt3DRender::Render::ExpandBoundingVolumeJob expandBVolume; expandBVolume.setRoot(test->sceneRoot()); + expandBVolume.setManagers(test->nodeManagers()); expandBVolume.run(); Qt3DRender::Render::UpdateMeshTriangleListJob updateTriangleList; |