From de6ca6321cf5ab8c5b726c66f9871622bbf4e036 Mon Sep 17 00:00:00 2001
From: Acid Bubbles <acidbubbles.anon@gmail.com>
Date: Tue, 29 Dec 2020 21:53:26 -0500
Subject: [PATCH] Fix master animations not propagating since the last release

---
 Folder.DotSettings                  | 1 +
 src/AtomAnimations/AtomAnimation.cs | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Folder.DotSettings b/Folder.DotSettings
index 29cd16d7..5db87322 100644
--- a/Folder.DotSettings
+++ b/Folder.DotSettings
@@ -1,6 +1,7 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CompareOfFloatsByEqualityOperator/@EntryIndexedValue">SUGGESTION</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ForCanBeConvertedToForeach/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ForeachCanBePartlyConvertedToQueryUsingAnotherGetEnumerator/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ParameterHidesMember/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=Constants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=Property/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
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);
         }