summaryrefslogtreecommitdiffstats
path: root/src/render/framegraph
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2015-09-30 14:43:00 +0200
committerPaul Lemire <paul.lemire@kdab.com>2015-10-14 16:00:40 +0000
commit5a68f200737661acb52104b6cf4c8bb757a3abb5 (patch)
treedcdd2690ecc1271f15efae7085eeaf669bf1e7da /src/render/framegraph
parent967092ea31f08b616c3bed9c0060b6082f794fb8 (diff)
QRenderTargetSelector fixes:
- Property copy drawBuffers when cloning - Check that the target isn't null when we try to set its parent Change-Id: I61b1f8972f9813efa371b929b26490d0a0b577c2 Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
Diffstat (limited to 'src/render/framegraph')
-rw-r--r--src/render/framegraph/qrendertargetselector.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/render/framegraph/qrendertargetselector.cpp b/src/render/framegraph/qrendertargetselector.cpp
index 58529ae09..c3fca07a7 100644
--- a/src/render/framegraph/qrendertargetselector.cpp
+++ b/src/render/framegraph/qrendertargetselector.cpp
@@ -62,6 +62,7 @@ void QRenderTargetSelector::copy(const QNode *ref)
const QRenderTargetSelector *other = static_cast<const QRenderTargetSelector*>(ref);
+ setDrawBuffers(other->drawBuffers());
if (other->d_func()->m_target)
setTarget(qobject_cast<QRenderTarget *>(QNode::clone(other->d_func()->m_target)));
}
@@ -83,7 +84,7 @@ void QRenderTargetSelector::setTarget(QRenderTarget *target)
d->m_target = target;
// For inline declaration cases
- if (!target->parent())
+ if (target != Q_NULLPTR && !target->parent())
target->setParent(this);
emit targetChanged();
}