diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-05 13:58:50 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-05 13:58:50 +0200 |
commit | 6c77dea4711b6a88e80e30db21d622808e5ef9b6 (patch) | |
tree | 7f03934b19f5782447da135aeceb4269298e3f2a /src/quick3d/imports/scene3d/scene3ditem.cpp | |
parent | edc88e97721c0a223a2b77cec217f550f08a4135 (diff) | |
parent | d8789d8fd17fd58f06003e9846b3d107ffc8ec52 (diff) |
Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: I2a92242b0d6be4f4e7f07f0f020fa6751ada9bc3
Diffstat (limited to 'src/quick3d/imports/scene3d/scene3ditem.cpp')
-rw-r--r-- | src/quick3d/imports/scene3d/scene3ditem.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/quick3d/imports/scene3d/scene3ditem.cpp b/src/quick3d/imports/scene3d/scene3ditem.cpp index 2f791b202..ddb25777c 100644 --- a/src/quick3d/imports/scene3d/scene3ditem.cpp +++ b/src/quick3d/imports/scene3d/scene3ditem.cpp @@ -372,9 +372,6 @@ QSGNode *Scene3DItem::updatePaintNode(QSGNode *node, QQuickItem::UpdatePaintNode m_renderer->setCleanerHelper(m_rendererCleaner); } - // The main thread is blocked, it is now time to sync data between the renderer and the item. - m_renderer->synchronize(); - Scene3DSGNode *fboNode = static_cast<Scene3DSGNode *>(node); if (fboNode == nullptr) { fboNode = new Scene3DSGNode(); |