diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-23 03:02:27 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-23 03:02:27 +0200 |
| commit | e8563dbbb56194d48256af984813a98c56e0bb79 (patch) | |
| tree | 08d8c9a79f7d7b1d8f94ad0dc3244a4b87166295 /src/render/renderers/opengl/renderer/renderer.cpp | |
| parent | bd09583403b27dedb3d6a7c7c737b0c1a49432e1 (diff) | |
| parent | 1bb43d7be48813ba318bc2613d020dc8a3b71746 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I2a66e9344b72524431885bdf5f59fcaedb94c718
Diffstat (limited to 'src/render/renderers/opengl/renderer/renderer.cpp')
| -rw-r--r-- | src/render/renderers/opengl/renderer/renderer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/render/renderers/opengl/renderer/renderer.cpp b/src/render/renderers/opengl/renderer/renderer.cpp index 2ce87f965..b4a19c641 100644 --- a/src/render/renderers/opengl/renderer/renderer.cpp +++ b/src/render/renderers/opengl/renderer/renderer.cpp @@ -1679,7 +1679,7 @@ Renderer::ViewSubmissionResultData Renderer::submitRenderViews(const QVector<Ren // Reset state and call doneCurrent if the surface // is valid and was actually activated - if (surface && m_submissionContext->hasValidGLHelper()) { + if (lastUsedSurface && m_submissionContext->hasValidGLHelper()) { // Reset state to the default state if the last stateset is not the // defaultRenderStateSet if (m_submissionContext->currentStateSet() != m_defaultRenderStateSet) |