callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app: Correctly place merged down layer...

Browse Source 
when the image is in indexed color mode, and bottom layer doesn't
have an alpha channel.

Resolves: #4945
This commit is contained in:
Stanislav Grinkov
2021-08-11 01:09:28 +06:00
parent 72df5d6335
commit 16fe52582d
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/core/gimpimage-merge.c
View File

@ -620,8 +620,6 @@ gimp_image_merge_layers (GimpImage *image,
flatten_node = gimp_gegl_create_flatten_node ( flatten_node = gimp_gegl_create_flatten_node (
&bg, gimp_layer_get_real_composite_space (bottom_layer)); &bg, gimp_layer_get_real_composite_space (bottom_layer));
position = 0;
} }
else else
{ {
@ -643,7 +641,14 @@ gimp_image_merge_layers (GimpImage *image,
return NULL; return NULL;
} }
}
if (merge_type == GIMP_FLATTEN_IMAGE)
{
position = 0;
}
else
{
/* Find the index in the layer list of the bottom layer--we need this /* Find the index in the layer list of the bottom layer--we need this
* in order to add the final, merged layer to the layer list correctly * in order to add the final, merged layer to the layer list correctly
*/ */