dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

widgets: Don't merge filters on pixel locked layers 

Resolves #10767
Since you can't merge other layers onto a pixel
locked layer, it makes sense to prevent that with
NDE filters as well.
This commit is contained in:
Alx Sa 2024-02-06 18:20:36 +00:00
parent ba05730f78
commit 3e200c81d7
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/widgets/gimpitemtreeview.c
View File

@ -2556,8 +2556,8 @@ gimp_item_tree_view_effects_merged_clicked (GtkWidget *widget,
! strcmp (gimp_object_get_name (active_tool), "gimp-warp-tool"))
{
view->priv->effects_filter = NULL;
gimp_message_literal ( view->priv->image->gimp, G_OBJECT (view),
GIMP_MESSAGE_ERROR,
gimp_message_literal (view->priv->image->gimp, G_OBJECT (view),
GIMP_MESSAGE_ERROR,
_("Effects from active tools can not be merged."));
return;
@ -2568,6 +2568,15 @@ gimp_item_tree_view_effects_merged_clicked (GtkWidget *widget,
GimpImage *image = view->priv->image;
GeglNode *op = gimp_drawable_filter_get_operation (view->priv->effects_filter);
/* Don't merge if the layer is currently locked */
if (gimp_item_get_lock_content (GIMP_ITEM (view->priv->effects_drawable)))
{
gimp_message_literal (view->priv->image->gimp, G_OBJECT (view),
GIMP_MESSAGE_WARNING,
_("The layer to merge down to is locked."));
return;
}
if (op)
{
gimp_drawable_merge_filters (GIMP_DRAWABLE (view->priv->effects_drawable));