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

fix for merging indexed and indexed alpha images (from raph) 

-Yosh
This commit is contained in:
Manish Singh 1998-05-17 21:45:51 +00:00
parent dabaf0c8e1
commit 488c4c9851
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Sun May 17 14:44:32 PDT 1998 Manish Singh <yosh@gimp.org>
* app/gimage.c: fix for merging indexed and indexed-alpha layers
Sun May 17 14:02:44 PDT 1998 Manish Singh <yosh@gimp.org>
* app/app_procs.c: reverted the splash screen idle loop changes

3
app/gimage.c
View File

@ -1949,7 +1949,8 @@ gimage_merge_layers (GImage *gimage, GSList *merge_list, MergeType merge_type)
/* Start a merge undo group */
undo_push_group_start (gimage, LAYER_MERGE_UNDO);
if (merge_type == FlattenImage)
if (merge_type == FlattenImage ||
!layer_has_alpha (layer))
{
switch (gimage_base_type (gimage))
{