diff --git a/Folder.DotSettings b/Folder.DotSettings index 29cd16d7..5db87322 100644 --- a/Folder.DotSettings +++ b/Folder.DotSettings @@ -1,6 +1,7 @@  SUGGESTION DO_NOT_SHOW + DO_NOT_SHOW HINT <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> diff --git a/src/AtomAnimations/AtomAnimation.cs b/src/AtomAnimations/AtomAnimation.cs index cf94cfa8..1dfe84e2 100644 --- a/src/AtomAnimations/AtomAnimation.cs +++ b/src/AtomAnimations/AtomAnimation.cs @@ -425,10 +425,10 @@ private void AdvanceClipsTime(float delta) private void Blend(AtomAnimationClip clip, float weight, float duration) { - clip.playbackEnabled = true; + if (!clip.playbackEnabled) clip.playbackBlendWeight = 0f; clip.playbackBlendRate = (weight - clip.playbackBlendWeight) / duration; if (clip.playbackEnabled) return; - clip.playbackBlendWeight = 0; + clip.playbackEnabled = true; onClipIsPlayingChanged.Invoke(clip); }