When splitting, change the layer name, not the anim name and add them…

… in order
acidbubbles · Sep 8, 2021 · 7978a1b · 7978a1b
1 parent 325931f
commit 7978a1b
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/AtomAnimations/Operations/LayersOperations.cs b/src/AtomAnimations/Operations/LayersOperations.cs
@@ -22,11 +22,12 @@ public AtomAnimationClip Add()
 
         public void SplitLayer(List<IAtomAnimationTarget> targets)
         {
-            var layerName = GetSplitAnimationName(_clip.animationLayer, _animation.index.ByLayer().Select(c => c[0].animationLayer).ToList());
-            foreach (var sourceClip in _animation.index.ByLayer(_clip.animationLayer).Reverse().ToList())
+            var layerName = GetSplitLayerName(_clip.animationLayer, _animation.index.ByLayer().Select(c => c[0].animationLayer).ToList());
+            foreach (var sourceClip in _animation.index.ByLayer(_clip.animationLayer).ToList())
             {
-                var newClip = _animation.CreateClip(layerName, GetSplitAnimationName(sourceClip.animationName, _animation.clips.Select(c => c.animationName).ToList()));
+                var newClip = _animation.CreateClip(layerName, sourceClip.animationName);
                 sourceClip.CopySettingsTo(newClip);
+                newClip.animationLayer = layerName;
                 foreach (var t in sourceClip.GetAllTargets().Where(t => targets.Any(t.TargetsSameAs)).ToList())
                 {
                     sourceClip.Remove(t);
@@ -56,11 +57,11 @@ private string GetNewAnimationName()
             return Guid.NewGuid().ToString();
         }
 
-        private static string GetSplitAnimationName(string sourceAnimationName, IList<string> list)
+        private static string GetSplitLayerName(string sourceLayerName, IList<string> list)
         {
             for (var i = 1; i < 999; i++)
             {
-                var animationName = $"{sourceAnimationName} (Split {i})";
+                var animationName = $"{sourceLayerName} (Split {i})";
                 if (list.All(n => n != animationName)) return animationName;
             }
             return Guid.NewGuid().ToString();