diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2016-04-29 12:55:29 +0200 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-01 12:18:14 +0000 |
| commit | c86039d487509eddd405daa6818b9f861948d4ed (patch) | |
| tree | 38fe462b5d9dd77452604df05c873d36fd6aadae /src/render/materialsystem/qrenderpass.cpp | |
| parent | b8eac0e9abf4bf47454919424c904a2de089bd2a (diff) | |
QNodeRemovedChange: contains QNodeIdTypePair
Change-Id: I081f814c4d0a942e50c37cf30a5f731f67df5cb3
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/materialsystem/qrenderpass.cpp')
| -rw-r--r-- | src/render/materialsystem/qrenderpass.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/render/materialsystem/qrenderpass.cpp b/src/render/materialsystem/qrenderpass.cpp index 88c059ac8..f55102324 100644 --- a/src/render/materialsystem/qrenderpass.cpp +++ b/src/render/materialsystem/qrenderpass.cpp @@ -82,7 +82,7 @@ void QRenderPass::setShaderProgram(QShaderProgram *shaderProgram) if (d->m_shader != shaderProgram) { if (d->m_shader != Q_NULLPTR && d->m_changeArbiter != Q_NULLPTR) { - const auto change = QNodeRemovedPropertyChangePtr::create(id(), d->m_shader->id()); + const auto change = QNodeRemovedPropertyChangePtr::create(id(), d->m_shader); change->setPropertyName("shaderProgram"); d->notifyObservers(change); } @@ -139,7 +139,7 @@ void QRenderPass::removeFilterKey(QFilterKey *filterKey) Q_ASSERT(filterKey); Q_D(QRenderPass); if (d->m_changeArbiter != Q_NULLPTR) { - const auto change = QNodeRemovedPropertyChangePtr::create(id(), filterKey->id()); + const auto change = QNodeRemovedPropertyChangePtr::create(id(), filterKey); change->setPropertyName("filterKeys"); d->notifyObservers(change); } @@ -186,7 +186,7 @@ void QRenderPass::removeRenderState(QRenderState *state) Q_ASSERT(state); Q_D(QRenderPass); if (d->m_changeArbiter != Q_NULLPTR) { - const auto change = QNodeRemovedPropertyChangePtr::create(id(), state->id()); + const auto change = QNodeRemovedPropertyChangePtr::create(id(), state); change->setPropertyName("renderState"); d->notifyObservers(change); } @@ -230,7 +230,7 @@ void QRenderPass::removeParameter(QParameter *parameter) Q_ASSERT(parameter); Q_D(QRenderPass); if (d->m_changeArbiter != Q_NULLPTR) { - const auto change = QNodeRemovedPropertyChangePtr::create(id(), parameter->id()); + const auto change = QNodeRemovedPropertyChangePtr::create(id(), parameter); change->setPropertyName("parameter"); d->notifyObservers(change); } |