Merge "FrameGraphNode: mark dirty on cleanup"v5.14.0-beta2

3 files changed, 5 insertions, 2 deletions

diff --git a/src/render/framegraph/framegraphnode.cpp b/src/render/framegraph/framegraphnode.cpp
index 58ff05dc0..40d8fca3d 100644
--- a/src/render/framegraph/framegraphnode.cpp
+++ b/src/render/framegraph/framegraphnode.cpp
@@ -123,6 +123,7 @@ QVector<FrameGraphNode *> FrameGraphNode::children() const
 void FrameGraphNode::cleanup()
 {
     setParentId({});
+    markDirty(AbstractRenderer::FrameGraphDirty);
 }
 
 void FrameGraphNode::syncFromFrontEnd(const Qt3DCore::QNode *frontEnd, bool firstTime)
diff --git a/src/render/geometry/buffer.cpp b/src/render/geometry/buffer.cpp
index 998db3640..0ce81efc1 100644
--- a/src/render/geometry/buffer.cpp
+++ b/src/render/geometry/buffer.cpp
@@ -130,8 +130,10 @@ void Buffer::syncFromFrontEnd(const QNode *frontEnd, bool firstTime)
     if (!node)
         return;
 
-    if (firstTime && m_manager != nullptr)
+    if (firstTime && m_manager != nullptr) {
         m_manager->addBufferReference(peerId());
+        m_bufferDirty = true;
+    }
 
     m_syncData = node->isSyncData();
     m_access = node->accessType();
diff --git a/src/render/geometry/qbuffer.cpp b/src/render/geometry/qbuffer.cpp
index f27005f2b..d27da25c7 100644
--- a/src/render/geometry/qbuffer.cpp
+++ b/src/render/geometry/qbuffer.cpp
@@ -329,7 +329,7 @@ void QBuffer::setData(const QByteArray &bytes)
     Q_D(QBuffer);
     if (bytes != d->m_data) {
         d->m_data = bytes;
-        Qt3DCore::QNodePrivate::get(this)->update();
+        d->update();
         emit dataChanged(bytes);
     }
 }