diff options
author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-10-11 16:01:22 +0300 |
---|---|---|
committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-10-11 16:01:22 +0300 |
commit | e1b1a0d2970fd384bd52c734a72536d8452ad070 (patch) | |
tree | 494b70bc1a1e115d7ecce39e698d9621af717971 /src/quick3d/imports/scene3d/scene3drenderer.cpp | |
parent | c1f8fa2578d99e07f5e581f26bd532695b9534f9 (diff) | |
parent | b59fdcefdbce6a1870e49b0da14d30b51293dea6 (diff) |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.12' into tqtc/lts-5.15-opensourcev5.15.12-lts-lgpl
Change-Id: If1ce1579db02b74dde74731fcf6163614961841f
Diffstat (limited to 'src/quick3d/imports/scene3d/scene3drenderer.cpp')
-rw-r--r-- | src/quick3d/imports/scene3d/scene3drenderer.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/quick3d/imports/scene3d/scene3drenderer.cpp b/src/quick3d/imports/scene3d/scene3drenderer.cpp index 51589de6c..275068b60 100644 --- a/src/quick3d/imports/scene3d/scene3drenderer.cpp +++ b/src/quick3d/imports/scene3d/scene3drenderer.cpp @@ -148,6 +148,7 @@ Scene3DRenderer::Scene3DRenderer() , m_shouldRender(false) , m_dirtyViews(false) , m_skipFrame(false) + , m_skippedLastFrame(false) , m_allowRendering(0) , m_compositingMode(Scene3DItem::FBO) { @@ -235,9 +236,16 @@ void Scene3DRenderer::beforeSynchronize() m_skipFrame = false; ContextSaver saver; static_cast<QRenderAspectPrivate*>(QRenderAspectPrivate::get(m_renderAspect))->renderSynchronous(false); + + // Ensure the QtQuick GL state is reset to prevent previous Qt3D calls from leaving some objects bound in the state + if (!m_skippedLastFrame) + m_window->resetOpenGLState(); + + m_skippedLastFrame = true; return; } + m_skippedLastFrame = false; m_shouldRender = true; // Check size / multisampling |