diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2015-02-25 15:38:42 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2015-02-28 16:28:54 +0000 |
| commit | 66fc1e35db664ecaf0b37c855eea7391c0576773 (patch) | |
| tree | cb805d9a294c40fb9a08cc985ee41366e962f20e /src/render/frontend/qmaterial.cpp | |
| parent | 653ff3d4d5f992b64c4949e9741f4213a81a9f42 (diff) | |
ChangeArbiter/SceneChange: use id as change subject
Instead of having a QNode* or QObservable as the subject of a change, we use
it's unique NodeId instead. That will prevent the ChangeArbiter from trying to
distribute changes by looking at a QNode/QObservable id when the
QNode/QObservable might have been destroyed in the meantime.
Change-Id: Ia419d5b841434fd65522c8c65de552089cfe97cf
Task-number: QTBUG-44628
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/frontend/qmaterial.cpp')
| -rw-r--r-- | src/render/frontend/qmaterial.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/render/frontend/qmaterial.cpp b/src/render/frontend/qmaterial.cpp index 79652d032..e9de8a21c 100644 --- a/src/render/frontend/qmaterial.cpp +++ b/src/render/frontend/qmaterial.cpp @@ -99,7 +99,7 @@ void QMaterial::setEffect(QEffect *effect) if (effect != d->m_effect) { if (d->m_effect && d->m_changeArbiter) { - QScenePropertyChangePtr change(new QScenePropertyChange(NodeRemoved, this)); + QScenePropertyChangePtr change(new QScenePropertyChange(NodeRemoved, QSceneChange::Node, id())); change->setPropertyName("effect"); change->setValue(QVariant::fromValue(d->m_effect->id())); d->notifyObservers(change); @@ -116,7 +116,7 @@ void QMaterial::setEffect(QEffect *effect) effect->setParent(this); if (d->m_effect && d->m_changeArbiter) { - QScenePropertyChangePtr change(new QScenePropertyChange(NodeAdded, this)); + QScenePropertyChangePtr change(new QScenePropertyChange(NodeAdded, QSceneChange::Node, id())); change->setPropertyName("effect"); change->setValue(QVariant::fromValue(effect->id())); d->notifyObservers(change); @@ -147,7 +147,7 @@ void QMaterial::addParameter(QParameter *parameter) parameter->setParent(this); if (d->m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr change(new QScenePropertyChange(NodeAdded, this)); + QScenePropertyChangePtr change(new QScenePropertyChange(NodeAdded, QSceneChange::Node, id())); change->setPropertyName("parameter"); change->setValue(QVariant::fromValue(parameter->id())); d->notifyObservers(change); @@ -159,7 +159,7 @@ void QMaterial::removeParameter(QParameter *parameter) { Q_D(QMaterial); if (d->m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr change(new QScenePropertyChange(NodeRemoved, this)); + QScenePropertyChangePtr change(new QScenePropertyChange(NodeRemoved, QSceneChange::Node, id())); change->setPropertyName("parameter"); change->setValue(QVariant::fromValue(parameter->id())); d->notifyObservers(change); |