summaryrefslogtreecommitdiffstats
path: root/src/runtime/q3dsanimationmanager.cpp
diff options
context:
space:
mode:
authorChristian Strømme <christian.stromme@qt.io>2018-11-06 10:46:12 +0100
committerLaszlo Agocs <laszlo.agocs@qt.io>2018-11-06 09:55:09 +0000
commit6d5c9b2be5c9c6cd0d407148bb84e81b37d58fc5 (patch)
treeed0ed28e953a5d753cf62efe1fea5e52f16b5add /src/runtime/q3dsanimationmanager.cpp
parentade5e4e2a25aaf470a65ebbe58800dc5d168d16e (diff)
Revert "Improve state handling"
This commit is introducing to many regressions at this point, so the best option is to revert it now and re-apply once the remaining issue are resolved. This reverts commit 55b43d3e1c3a100f4ad41d94c132afd2a0d029b3. Change-Id: If2733c506aa64a242a4605d81d69f66e2f7aae41 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src/runtime/q3dsanimationmanager.cpp')
-rw-r--r--src/runtime/q3dsanimationmanager.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/runtime/q3dsanimationmanager.cpp b/src/runtime/q3dsanimationmanager.cpp
index 40d5fff..51a6c73 100644
--- a/src/runtime/q3dsanimationmanager.cpp
+++ b/src/runtime/q3dsanimationmanager.cpp
@@ -476,7 +476,7 @@ void Q3DSAnimationManager::clearAnimations(Q3DSSlide *slide)
// Remove all other animatiors that was associated with this slide
Q3DSSlideAttached *slideAttached = static_cast<Q3DSSlideAttached *>(slide->attached());
for (auto animator : slideAttached->animators) {
- animator->stop();
+ Q_ASSERT(!animator->isRunning());
slideAttached->entity->removeComponent(animator);
delete animator;
}