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

[N/A <ell src gnome org>]

commit 7e661d3ca9091751cfa86b966e1128802912f14e
Author: Ell <ell_se yahoo com>
Date:   Mon Feb 5 15:32:55 2018 -0500

    pdb: allow adding masks to group layers in layer-add-mask
    
    ... and a small fix to last commit.

 app/pdb/layer-cmds.c |    7 +++----
 pdb/groups/layer.pdb |    7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)
---
diff --git a/app/pdb/layer-cmds.c b/app/pdb/layer-cmds.c
index 12e4fa6..c4aaf30 100644
--- a/app/pdb/layer-cmds.c
+++ b/app/pdb/layer-cmds.c
@@ -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;
diff --git a/pdb/groups/layer.pdb b/pdb/groups/layer.pdb
index e1edf29..f5e0e0c 100644
--- a/pdb/groups/layer.pdb
+++ b/pdb/groups/layer.pdb
@@ -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;