Fix dynamic keyframes

Don't generate dynamic kf on first entry to a slide, since there are
no "from" values yet.

Task-number: QT3DS-2209
Change-Id: Ib4e59968d9099b77ea6d11f1b627b77cad194a23
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>

1 files changed, 5 insertions, 4 deletions

diff --git a/src/runtime/q3dsanimationmanager.cpp b/src/runtime/q3dsanimationmanager.cpp
index 51a6c73..cdb6e5e 100644
--- a/src/runtime/q3dsanimationmanager.cpp
+++ b/src/runtime/q3dsanimationmanager.cpp
@@ -121,7 +121,8 @@ static int componentSuffixToIndex(const QString &s)
 
 void Q3DSAnimationManager::updateAnimationHelper(const AnimationTrackListMap &targets,
                                                  Q3DSSlide *slide,
-                                                 bool editorMode)
+                                                 bool editorMode,
+                                                 bool updateDkf)
 {
     // QT3DS-2183: We'll use this to set dummy kf at the start and end of the clip.
     // See code further down.
@@ -339,7 +340,7 @@ void Q3DSAnimationManager::updateAnimationHelper(const AnimationTrackListMap &ta
             const bool isDynamic = animationTrack->isDynamic() && !editorMode;
             // If track is marked as dynamic, update the first keyframe so it interpolates from
             // the current position to the next.
-            if (isDynamic)
+            if (isDynamic && updateDkf)
                 updateDynamicKeyFrame(keyFrames[0], target, prop);
 
             // QT3DS-2183 - We add keyframes at the start and at the end of the clip
@@ -509,7 +510,7 @@ static void insertTrack(Q3DSAnimationManager::AnimationTrackList &trackList,
     }
 }
 
-void Q3DSAnimationManager::updateAnimations(Q3DSSlide *slide, bool editorMode)
+void Q3DSAnimationManager::updateAnimations(Q3DSSlide *slide, bool editorMode, bool updateDynamicKfs)
 {
     Q_ASSERT(slide);
 
@@ -544,7 +545,7 @@ void Q3DSAnimationManager::updateAnimations(Q3DSSlide *slide, bool editorMode)
     buildTrackListMap(masterSlide, false);
     buildTrackListMap(slide, true);
 
-    updateAnimationHelper(trackListMap, slide, editorMode);
+    updateAnimationHelper(trackListMap, slide, editorMode, updateDynamicKfs);
 }
 
 void Q3DSAnimationManager::applyChanges()