dallasgroot/Gimp
dallasgroot/Gimp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

widgets: Don't check for operation when merging filters

Browse source 
Resolves #12855
Since tool-based filters like Warp Tool do not have operations,
checking them when merging down the active filter stack throws
a CRITICAL. The check was not needed, so it was removed.
This commit is contained in:
Alx Sa 2025-02-05 12:58:43 +00:00
parent dd59ee088c
commit bcbdf970a6
1 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
app/widgets/gimpitemtreeview.c
View file

@ -2821,33 +2821,29 @@ gimp_item_tree_view_effects_merged_clicked (GtkWidget *widget,
! gimp_viewable_get_children (GIMP_VIEWABLE (view->priv->effects_drawable)))
{
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_literal (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));
gimp_drawable_clear_filters (GIMP_DRAWABLE (view->priv->effects_drawable));
gimp_drawable_merge_filters (GIMP_DRAWABLE (view->priv->effects_drawable));
gimp_drawable_clear_filters (GIMP_DRAWABLE (view->priv->effects_drawable));
view->priv->effects_filter = NULL;
view->priv->effects_filter = NULL;
/* Close NDE pop-over on successful merge */
gtk_widget_set_visible (view->priv->effects_popover, FALSE);
/* Close NDE pop-over on successful merge */
gtk_widget_set_visible (view->priv->effects_popover, FALSE);
/* Hack to make the effects visibly change */
gimp_item_set_visible (GIMP_ITEM (view->priv->effects_drawable), FALSE, FALSE);
gimp_image_flush (image);
gimp_item_set_visible (GIMP_ITEM (view->priv->effects_drawable), TRUE, FALSE);
gimp_image_flush (image);
}
/* Hack to make the effects visibly change */
gimp_item_set_visible (GIMP_ITEM (view->priv->effects_drawable), FALSE, FALSE);
gimp_image_flush (image);
gimp_item_set_visible (GIMP_ITEM (view->priv->effects_drawable), TRUE, FALSE);
gimp_image_flush (image);
}
}