QRenderPassFilter fixes

- Only pass the id (to avoid clones) when an annotation is added
- Make clones of the parameters when a QRenderPassFilter is cloned

Change-Id: Id7e19f11d35ea5d891ce2a031c872400a8550197
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/src/render/framegraph/renderpassfilternode.cpp b/src/render/framegraph/renderpassfilternode.cpp
index 920460121..a2088d0aa 100644
--- a/src/render/framegraph/renderpassfilternode.cpp
+++ b/src/render/framegraph/renderpassfilternode.cpp
@@ -59,7 +59,7 @@ void RenderPassFilter::updateFromPeer(Qt3DCore::QNode *peer)
     m_parameterPack.clear();
     setEnabled(filter->isEnabled());
     Q_FOREACH (QAnnotation *criterion, filter->includes())
-        appendFilter(criterion);
+        appendFilter(criterion->id());
     Q_FOREACH (QParameter *p, filter->parameters())
         m_parameterPack.appendParameter(p->id());
 }
@@ -69,10 +69,10 @@ QList<Qt3DCore::QNodeId> RenderPassFilter::filters() const
     return m_filters;
 }
 
-void RenderPassFilter::appendFilter(QAnnotation *criterion)
+void RenderPassFilter::appendFilter(const Qt3DCore::QNodeId &criterionId)
 {
-    if (!m_filters.contains(criterion->id()))
-        m_filters.append(criterion->id());
+    if (!m_filters.contains(criterionId))
+        m_filters.append(criterionId);
 }
 
 void RenderPassFilter::removeFilter(const Qt3DCore::QNodeId &criterionId)
@@ -98,7 +98,7 @@ void RenderPassFilter::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 
     case NodeAdded: {
         if (propertyChange->propertyName() == QByteArrayLiteral("include"))
-            appendFilter(propertyChange->value().value<QAnnotation *>());
+            appendFilter(propertyChange->value().value<QNodeId>());
         else if (propertyChange->propertyName() == QByteArrayLiteral("parameter"))
             m_parameterPack.appendParameter(propertyChange->value().value<QNodeId>());
     }