Browse Source

Fixed merging

flabbet 8 months ago
parent
commit
1d25370893

+ 4 - 1
src/PixiEditor.ChangeableDocument/Changes/Drawing/CombineStructureMembersOnto_Change.cs

@@ -197,7 +197,10 @@ internal class CombineStructureMembersOnto_Change : Change
         foreach (var toMerge in membersToMerge)
         {
             var member = target.FindMemberOrThrow<LayerNode>(toMerge);
-            maxFrame = Math.Max(maxFrame, member.KeyFrames.Max(x => x.StartFrame + x.Duration));
+            if (member.KeyFrames.Count > 0)
+            {
+                maxFrame = Math.Max(maxFrame, member.KeyFrames.Max(x => x.StartFrame + x.Duration));
+            }
         }
 
         return maxFrame;