Commit eb03413b authored by Michael Natterer's avatar Michael Natterer 😴

Add separate check that prevents merging down to a group layer

parent 5383bf0d
......@@ -216,6 +216,13 @@ gimp_image_merge_down (GimpImage *image,
if (gimp_item_get_visible (GIMP_ITEM (layer)))
if (gimp_viewable_get_children (GIMP_VIEWABLE (layer)))
g_set_error_literal (error, 0, 0,
_("Cannot merge down to a group layer."));
return NULL;
if (gimp_item_get_lock_content (GIMP_ITEM (layer)))
g_set_error_literal (error, 0, 0,
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment