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

Bug 754297 - Show Layer Mask should not use the layer blend mode 

Call gimp_layer_update_mode_node() also when removing a mask, and
change it to only do its magic if there actually is a mask (don't only
look at the "show_mask" boolean).
This commit is contained in:
Michael Natterer 2015-09-01 10:26:21 +02:00
parent 0ff7ab3712
commit 216da3b5e2
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/core/gimplayer.c
View File

@ -490,7 +490,7 @@ gimp_layer_update_mode_node (GimpLayer *layer)
mode_node = gimp_drawable_get_mode_node (GIMP_DRAWABLE (layer));
if (layer->show_mask)
if (layer->mask && layer->show_mask)
{
visible_mode = GIMP_NORMAL_MODE;
linear = TRUE;
@ -1330,7 +1330,7 @@ gimp_layer_add_mask (GimpLayer *layer,
mode_node, "aux2");
}
gimp_layer_update_mode_node (layer);
gimp_layer_update_mode_node (layer);
}
if (gimp_layer_get_apply_mask (layer) ||
@ -1648,6 +1648,8 @@ gimp_layer_apply_mask (GimpLayer *layer,
{
gegl_node_disconnect (mode_node, "aux2");
}
gimp_layer_update_mode_node (layer);
}
/* If applying actually changed the view */
@ -1793,7 +1795,7 @@ gimp_layer_set_show_mask (GimpLayer *layer,
}
}
gimp_layer_update_mode_node (layer);
gimp_layer_update_mode_node (layer);
}
gimp_drawable_update (GIMP_DRAWABLE (layer),