diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-05-14 21:09:30 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-08-03 08:06:41 +0200 |
| commit | c9335062126a65dcaad6c43f24bb6a90db0e0cba (patch) | |
| tree | d093d06a190e76f7a02bf9eee57aab64e795f624 /src/quick3d/imports/scene3d/scene3drenderer.cpp | |
| parent | 5987ddcc5bc1ecb25e20ba92b2d4b5e627ad4418 (diff) | |
| parent | 8f1f3e71195faa369d70d75c7442f55979d2e855 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.15' into dev"
Diffstat (limited to 'src/quick3d/imports/scene3d/scene3drenderer.cpp')
| -rw-r--r-- | src/quick3d/imports/scene3d/scene3drenderer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick3d/imports/scene3d/scene3drenderer.cpp b/src/quick3d/imports/scene3d/scene3drenderer.cpp index e75dd9689..34207a431 100644 --- a/src/quick3d/imports/scene3d/scene3drenderer.cpp +++ b/src/quick3d/imports/scene3d/scene3drenderer.cpp @@ -160,13 +160,13 @@ Scene3DRenderer::Scene3DRenderer() , m_allowRendering(0) , m_compositingMode(Scene3DItem::FBO) { + } void Scene3DRenderer::init(Scene3DItem *item, Qt3DCore::QAspectEngine *aspectEngine, QRenderAspect *renderAspect) { m_item = item; - m_window = m_item->window(); m_aspectEngine = aspectEngine; m_renderAspect = renderAspect; m_needsShutdown = true; |