When starting an animation from a master timeline, ignore preserve lo…

…op settings
acidbubbles · Dec 30, 2020 · 056b6b8 · 056b6b8
1 parent a6ed729
commit 056b6b8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/AtomAnimations/AtomAnimation.cs b/src/AtomAnimations/AtomAnimation.cs
@@ -235,7 +235,7 @@ public void PlayClips(string animationName, bool sequencing)
                 PlayClip(clip, sequencing);
         }
 
-        public void PlayClip(AtomAnimationClip clip, bool sequencing)
+        public void PlayClip(AtomAnimationClip clip, bool sequencing, bool allowPreserveLoops = true)
         {
             if (clip.playbackEnabled && clip.playbackMainInLayer) return;
             if (!isPlaying)
@@ -251,10 +251,9 @@ public void PlayClip(AtomAnimationClip clip, bool sequencing)
             if (previousMain != null && previousMain != clip)
             {
                 if (previousMain.uninterruptible)
-                {
                     return;
-                }
-                if (clip.loop && clip.preserveLoops && previousMain.loop)
+
+                if (clip.loop && clip.preserveLoops && previousMain.loop && allowPreserveLoops)
                 {
                     previousMain.SetNext(clip.animationName, Mathf.Max(previousMain.animationLength - previousMain.clipTime, 0f));
                 }

diff --git a/src/PeerManager.cs b/src/PeerManager.cs
@@ -174,7 +174,7 @@ private void ReceiveMasterClipState(object[] e)
             foreach (var clip in GetClips(e))
             {
                 if (clip == null || clip.playbackEnabled) return;
-                animation.PlayClip(clip, true);
+                animation.PlayClip(clip, true, false);
             }
         }