diff options
Diffstat (limited to 'src/runtime/q3dsscenemanager.cpp')
| -rw-r--r-- | src/runtime/q3dsscenemanager.cpp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/runtime/q3dsscenemanager.cpp b/src/runtime/q3dsscenemanager.cpp index b89f254..b4cb002 100644 --- a/src/runtime/q3dsscenemanager.cpp +++ b/src/runtime/q3dsscenemanager.cpp @@ -8081,11 +8081,13 @@ void Q3DSSceneManager::handleSceneChange(Q3DSScene *, Q3DSGraphObject::DirtyFlag qCDebug(lcScene) << "Dyn.removing" << obj->attached()->entity; Q3DSUipPresentation::forAllObjectsInSubTree(obj, [this](Q3DSGraphObject *objOrChild) { + Q3DSGraphObjectAttached *data = objOrChild->attached(); + if (!data) + return; Q3DSSlidePlayer *slidePlayer = m_slidePlayer; - if (objOrChild->attached()->component) - slidePlayer = objOrChild->attached()->component->masterSlide()->attached<Q3DSSlideAttached>()->slidePlayer; + if (data->component) + slidePlayer = data->component->masterSlide()->attached<Q3DSSlideAttached>()->slidePlayer; slidePlayer->objectAboutToBeRemovedFromScene(objOrChild); - Q3DSGraphObjectAttached *data = objOrChild->attached(); if (data->propertyChangeObserverIndex >= 0) { objOrChild->removePropertyChangeObserver(data->propertyChangeObserverIndex); data->propertyChangeObserverIndex = -1; @@ -8102,6 +8104,11 @@ void Q3DSSceneManager::handleSceneChange(Q3DSScene *, Q3DSGraphObject::DirtyFlag removeLayerContent(obj, layer3DS); } } + // bye bye attached; it will get recreated in case obj gets added back later on + if (obj->attached()) { + delete obj->attached(); + obj->setAttached(nullptr); + } } } @@ -8189,6 +8196,8 @@ void Q3DSSceneManager::handleSlideGraphChange(Q3DSSlide *master, Q3DSGraphObject slide->removeSlideObjectChangeObserver(data->slideObjectChangeObserverIndex); data->slideObjectChangeObserverIndex = -1; } + delete data; + slide->setAttached(nullptr); } } |