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

pdb: allow adding masks to group layers in layer-add-mask 

... and a small fix to last commit.
This commit is contained in:
Ell 2018-02-05 15:32:55 -05:00
parent 9befb8594e
commit 7e661d3ca9
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/pdb/layer-cmds.c
View File

@ -736,8 +736,7 @@ layer_add_mask_invoker (GimpProcedure *procedure,
{
if (gimp_pdb_item_is_floating (GIMP_ITEM (mask),
gimp_item_get_image (GIMP_ITEM (layer)),
error) &&
gimp_pdb_item_is_not_group (GIMP_ITEM (layer), error))
error))
success = (gimp_layer_add_mask (layer, mask, TRUE, error) == mask);
else
success = FALSE;
@ -771,8 +770,8 @@ layer_remove_mask_invoker (GimpProcedure *procedure,
if (gimp_pdb_item_is_attached (GIMP_ITEM (layer), NULL, modify, error) &&
gimp_layer_get_mask (layer) &&
(! gimp_viewable_get_children (GIMP_VIEWABLE (layer)) ||
mode == GIMP_MASK_DISCARD))
(mode == GIMP_MASK_DISCARD ||
gimp_pdb_item_is_not_group (GIMP_ITEM (layer), error)))
gimp_layer_apply_mask (layer, mode, TRUE);
else
success = FALSE;

7
pdb/groups/layer.pdb
View File

@ -387,8 +387,7 @@ HELP
{
if (gimp_pdb_item_is_floating (GIMP_ITEM (mask),
gimp_item_get_image (GIMP_ITEM (layer)),
error) &&
gimp_pdb_item_is_not_group (GIMP_ITEM (layer), error))
error))
success = (gimp_layer_add_mask (layer, mask, TRUE, error) == mask);
else
success = FALSE;
@ -424,8 +423,8 @@ HELP
if (gimp_pdb_item_is_attached (GIMP_ITEM (layer), NULL, modify, error) &&
gimp_layer_get_mask (layer) &&
(! gimp_viewable_get_children (GIMP_VIEWABLE (layer)) ||
mode == GIMP_MASK_DISCARD))
(mode == GIMP_MASK_DISCARD ||
gimp_pdb_item_is_not_group (GIMP_ITEM (layer), error)))
gimp_layer_apply_mask (layer, mode, TRUE);
else
success = FALSE;