diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-07-31 15:40:18 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-07-31 15:40:18 +0200 |
| commit | f8a85093097cbd1783f19602513631e06c762fd9 (patch) | |
| tree | 8109c1a04a578c7a79a25b0a2fe4c1463b0a264c /src/render/renderers/opengl/renderer/renderer.cpp | |
| parent | f3b6963f8b873c190cc1033cb8dabaf1d63ee2b6 (diff) | |
| parent | 64e10caaa1c261167fd98f91ce87cbefd11782ca (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
tests/manual/manual.pro
Change-Id: I15d497da84d3fe684c3a598831171d6aed7534ca
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 68d31be71..b60eea33d 100644 --- a/src/render/renderers/opengl/renderer/renderer.cpp +++ b/src/render/renderers/opengl/renderer/renderer.cpp @@ -1648,7 +1648,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) |