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

app/tools: Don't merge filters on layer groups

Browse source 
Resolves #11993
In !1319, we added the ability to merge down filters destructively
in the Filter Tool GUI. This accidentally allowed you to merge down
a filter on a layer group. This patch adds checks to prevent this
option from being used, in the same way we hide the option when
editing an existing layer effect.
This commit is contained in:
Alx Sa 2024-09-04 01:34:56 +00:00
parent 455f6f0954
commit 3a0fb282a4
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/tools/gimpfiltertool.c
View file

@ -49,6 +49,7 @@
#include "core/gimpdrawable-filters.h"
#include "core/gimpdrawablefilter.h"
#include "core/gimperror.h"
#include "core/gimpgrouplayer.h"
#include "core/gimpguide.h"
#include "core/gimpimage.h"
#include "core/gimpimage-guides.h"
@ -393,8 +394,10 @@ gimp_filter_tool_initialize (GimpTool *tool,
toggle = gimp_prop_check_button_new (G_OBJECT (tool_info->tool_options),
"preview", NULL);
/* Only show merge filter option if we're not editing an NDE filter */
if (GIMP_IS_LAYER (drawable) && ! filter_tool->existing_filter)
/* Only show merge filter option if we're not editing an NDE filter or
* applying to a layer group */
if ((GIMP_IS_LAYER (drawable) && ! GIMP_IS_GROUP_LAYER (drawable)) &&
! filter_tool->existing_filter)
{
gtk_box_pack_start (GTK_BOX (hbox), toggle, FALSE, FALSE, 0);
@ -545,6 +548,10 @@ gimp_filter_tool_control (GimpTool *tool,
g_free (operation_name);
}
/* Ensure that filters applied to group layers are non-destructive */
if (GIMP_IS_GROUP_LAYER (drawable))
non_destructive = TRUE;
gimp_filter_tool_commit (filter_tool, non_destructive);
break;
}