diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2019-04-25 15:27:11 +0200 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2019-04-26 07:14:12 +0200 |
| commit | 06f41f15abaacc9f6f7acb8e51d2cfb68705a924 (patch) | |
| tree | 210403f4bb9872940f8db4ab656238e9f14e1b98 /src/render/renderers/opengl/renderer/renderer_p.h | |
| parent | 9b140ccba930f159443a70a81eb1d2585b6070f9 (diff) | |
| parent | fed848f7dcff99cf5adb3b7b45190826b3dcf898 (diff) | |
Merge remote-tracking branch 5.12 into 5.13
Change-Id: I42affdd02bddb5205b9f2455f0c5e5efbd414dd8
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 97bd4f73e..5b5f5c4f4 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; |