Browse Source

Fixed merge layers

flabbet 4 years ago
parent
commit
1df55d313e
1 changed files with 2 additions and 2 deletions
  1. 2 2
      PixiEditor/Models/DataHolders/Document/Document.Layers.cs

+ 2 - 2
PixiEditor/Models/DataHolders/Document/Document.Layers.cs

@@ -359,7 +359,7 @@ namespace PixiEditor.Models.DataHolders
 
             Layer placeholderLayer = new("_placeholder");
             Layers.Insert(index, placeholderLayer);
-            LayerStructure.AssignParent(placeholderLayer.LayerGuid, groupParent.GroupGuid);
+            LayerStructure.AssignParent(placeholderLayer.LayerGuid, groupParent?.GroupGuid);
 
             for (int i = 0; i < layersToMerge.Length - 1; i++)
             {
@@ -370,7 +370,7 @@ namespace PixiEditor.Models.DataHolders
             }
 
             Layers.Insert(index, mergedLayer);
-            LayerStructure.AssignParent(mergedLayer.LayerGuid, groupParent.GroupGuid);
+            LayerStructure.AssignParent(mergedLayer.LayerGuid, groupParent?.GroupGuid);
 
             RemoveLayer(placeholderLayer, false);