summaryrefslogtreecommitdiffstats
path: root/src/quick3d/imports/scene3d/scene3drenderer.cpp
diff options
context:
space:
mode:
authorMike Krus <mike.krus@kdab.com>2020-06-12 21:29:08 +0100
committerMike Krus <mike.krus@kdab.com>2020-06-12 22:35:03 +0100
commitf03afcf1a19c48dd1d95ba421f7d90f9e2cdc1cc (patch)
treed213ea47e26dca859eb7755074a3378cf8dce616 /src/quick3d/imports/scene3d/scene3drenderer.cpp
parentd604120720850533cb95d69ce37dfadf00fd03ba (diff)
Update dependencies
Commented out calls to resetOpenGLState which has moved in QtDeclarative. Leaves Scene3D and Scene2D in broken state. Change-Id: Ib1a5dcdde34c1bb177518dd891d123d3a5322d9d Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Diffstat (limited to 'src/quick3d/imports/scene3d/scene3drenderer.cpp')
-rw-r--r--src/quick3d/imports/scene3d/scene3drenderer.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/quick3d/imports/scene3d/scene3drenderer.cpp b/src/quick3d/imports/scene3d/scene3drenderer.cpp
index a39cfd43d..0a244da5b 100644
--- a/src/quick3d/imports/scene3d/scene3drenderer.cpp
+++ b/src/quick3d/imports/scene3d/scene3drenderer.cpp
@@ -413,7 +413,8 @@ void Scene3DRenderer::render()
// The OpenGL state may be dirty from the previous QtQuick nodes, so reset
// it here to give Qt3D the clean state it expects
- m_window->resetOpenGLState();
+ // TODOQT6 Restore functionality
+// m_window->resetOpenGLState();
// Create and bind FBO if using the FBO compositing mode
const bool usesFBO = m_compositingMode == Scene3DItem::FBO;
@@ -457,7 +458,8 @@ void Scene3DRenderer::render()
// Reset the state used by the Qt Quick scenegraph to avoid any
// interference when rendering the rest of the UI.
- m_window->resetOpenGLState();
+ // TODOQT6 Restore functionality
+// m_window->resetOpenGLState();
}
} // namespace Qt3DRender