summaryrefslogtreecommitdiffstats
path: root/src/core/qchangearbiter.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/qchangearbiter.cpp')
-rw-r--r--src/core/qchangearbiter.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/core/qchangearbiter.cpp b/src/core/qchangearbiter.cpp
index 86ddc7d72..1d111d642 100644
--- a/src/core/qchangearbiter.cpp
+++ b/src/core/qchangearbiter.cpp
@@ -124,8 +124,7 @@ void QChangeArbiter::distributeQueueChanges(QChangeQueue *changeQueue)
switch (change->observableType()) {
case QSceneChange::Observable: {
- QObservableInterface *subject = change->subject().m_observable;
- QNodeId nodeId = m_scene->nodeIdFromObservable(subject);
+ const QNodeId nodeId = change->subjectId();
if (m_nodeObservations.contains(nodeId)) {
QObserverList &observers = m_nodeObservations[nodeId];
Q_FOREACH (const QObserverPair&observer, observers) {
@@ -139,9 +138,9 @@ void QChangeArbiter::distributeQueueChanges(QChangeQueue *changeQueue)
}
case QSceneChange::Node: {
- QNode *subject = change->subject().m_node;
- if (m_nodeObservations.contains(subject->id())) {
- QObserverList &observers = m_nodeObservations[subject->id()];
+ const QNodeId nodeId = change->subjectId();
+ if (m_nodeObservations.contains(nodeId)) {
+ QObserverList &observers = m_nodeObservations[nodeId];
Q_FOREACH (const QObserverPair&observer, observers) {
if ((change->type() & observer.first))
observer.second->sceneChangeEvent(change);