Commit 56920dcd authored by Ell's avatar Ell
Browse files

app: don't let image component mask affect channel colors

Connect GimpImage's gimp:mask-components node to the layers node
*before* connecting the channels node, so that the image's
component mask doesn't affect the channel colors, as is the case in
2.8.
parent 963322fd
...@@ -1565,14 +1565,6 @@ gimp_image_get_graph (GimpProjectable *projectable) ...@@ -1565,14 +1565,6 @@ gimp_image_get_graph (GimpProjectable *projectable)
gegl_node_add_child (private->graph, layers_node); gegl_node_add_child (private->graph, layers_node);
channels_node =
gimp_filter_stack_get_graph (GIMP_FILTER_STACK (private->channels->container));
gegl_node_add_child (private->graph, channels_node);
gegl_node_connect_to (layers_node, "output",
channels_node, "input");
mask = ~gimp_image_get_visible_mask (image) & GIMP_COMPONENT_MASK_ALL; mask = ~gimp_image_get_visible_mask (image) & GIMP_COMPONENT_MASK_ALL;
private->visible_mask = private->visible_mask =
...@@ -1581,13 +1573,21 @@ gimp_image_get_graph (GimpProjectable *projectable) ...@@ -1581,13 +1573,21 @@ gimp_image_get_graph (GimpProjectable *projectable)
"mask", mask, "mask", mask,
NULL); NULL);
gegl_node_connect_to (channels_node, "output", gegl_node_connect_to (layers_node, "output",
private->visible_mask, "input"); private->visible_mask, "input");
output = gegl_node_get_output_proxy (private->graph, "output"); channels_node =
gimp_filter_stack_get_graph (GIMP_FILTER_STACK (private->channels->container));
gegl_node_add_child (private->graph, channels_node);
gegl_node_connect_to (private->visible_mask, "output", gegl_node_connect_to (private->visible_mask, "output",
output, "input"); channels_node, "input");
output = gegl_node_get_output_proxy (private->graph, "output");
gegl_node_connect_to (channels_node, "output",
output, "input");
return private->graph; return private->graph;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment