Fix merging down linked layers (https://community.aseprite.org/t/2894)

aseprite · Apr 13, 2019 · 11c8ba3 · 11c8ba3
1 parent ebca165
commit 11c8ba3
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/app/commands/cmd_merge_down_layer.cpp b/src/app/commands/cmd_merge_down_layer.cpp
@@ -137,12 +137,14 @@ void MergeDownLayerCommand::onExecute(Context* context)
           opacity,
           src_layer->blendMode());
 
-        tx(new cmd::SetCelPosition(dst_cel,
-            bounds.x, bounds.y));
-
+        // First unlink the dst_cel
         if (dst_cel->links())
           tx(new cmd::UnlinkCel(dst_cel));
 
+        // Then modify the dst_cel
+        tx(new cmd::SetCelPosition(dst_cel,
+            bounds.x, bounds.y));
+
         tx(new cmd::ReplaceImage(sprite,
             dst_cel->imageRef(), new_image));
       }