diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2019-05-09 08:42:06 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-05-09 09:09:28 +0000 |
commit | c5ff1f7f159b4dfa0fc2803df9866eab18339eaa (patch) | |
tree | 414037b99d63dbcc405db046594e900076ef4c2e /src/render/renderers/opengl/renderer/renderer_p.h | |
parent | 5679b23c5338ae41d12755cf4e26a95bc391d0a9 (diff) | |
parent | e9642824244fa9fe55dca2cef8e002192a4f1b17 (diff) |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/render/backend/abstractrenderer_p.h
src/render/renderers/opengl/renderer/renderer.cpp
tests/auto/render/renderer/tst_renderer.cpp
Change-Id: Ib6da858f10bec57bdb1002bd8fa4172304d118f2
Diffstat (limited to 'src/render/renderers/opengl/renderer/renderer_p.h')
-rw-r--r-- | src/render/renderers/opengl/renderer/renderer_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/render/renderers/opengl/renderer/renderer_p.h b/src/render/renderers/opengl/renderer/renderer_p.h index 9a2c99c30..e82d18f77 100644 --- a/src/render/renderers/opengl/renderer/renderer_p.h +++ b/src/render/renderers/opengl/renderer/renderer_p.h @@ -78,6 +78,7 @@ #include <Qt3DRender/private/filtercompatibletechniquejob_p.h> #include <Qt3DRender/private/updateskinningpalettejob_p.h> #include <Qt3DRender/private/updateentitylayersjob_p.h> +#include <Qt3DRender/private/updateentityhierarchyjob_p.h> #include <Qt3DRender/private/renderercache_p.h> #include <Qt3DRender/private/texture_p.h> #include <Qt3DRender/private/glfence_p.h> @@ -367,6 +368,7 @@ private: UpdateMeshTriangleListJobPtr m_updateMeshTriangleListJob; FilterCompatibleTechniqueJobPtr m_filterCompatibleTechniqueJob; UpdateEntityLayersJobPtr m_updateEntityLayersJob; + UpdateEntityHierarchyJobPtr m_updateEntityHierarchyJob; QVector<Qt3DCore::QNodeId> m_pendingRenderCaptureSendRequests; |