Merge pull request #13196 from sebavan/master

Fix animatable loop

packages/dev/core/src/Animations/animatable.ts

@@ -23,6 +23,7 @@ export class Animatable {
     private _weight = -1.0;
     private _syncRoot: Nullable<Animatable> = null;
     private _frameToSyncFromJump: Nullable<number> = null;
+    private _goToFrame: Nullable<number> = null;
 
     /**
      * Gets or sets a boolean indicating if the animatable must be disposed and removed at the end of the animation.
@@ -96,6 +97,11 @@ export class Animatable {
             animation._prepareForSpeedRatioChange(value);
         }
         this._speedRatio = value;
+
+        // Resync _manualJumpDelay in case goToFrame was called before speedRatio was set.
+        if (this._goToFrame !== null) {
+            this.goToFrame(this._goToFrame);
+        }
     }
 
     /**
@@ -281,6 +287,8 @@ export class Animatable {
         for (let index = 0; index < runtimeAnimations.length; index++) {
             runtimeAnimations[index].goToFrame(frame);
         }
+
+        this._goToFrame = frame;
     }
 
     /**
@@ -398,6 +406,8 @@ export class Animatable {
             this._frameToSyncFromJump = null;
         }
 
+        this._goToFrame = null;
+
         if (this._weight === 0) {
             // We consider that an animation with a weight === 0 is "actively" paused
             return true;