From 488c4c98516f1083ad2ec1a16b3e87600658f9fa Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Sun, 17 May 1998 21:45:51 +0000 Subject: [PATCH] fix for merging indexed and indexed alpha images (from raph) -Yosh --- ChangeLog | 4 ++++ app/gimage.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d4738246c1..db5f1cf454 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sun May 17 14:44:32 PDT 1998 Manish Singh + + * app/gimage.c: fix for merging indexed and indexed-alpha layers + Sun May 17 14:02:44 PDT 1998 Manish Singh * app/app_procs.c: reverted the splash screen idle loop changes diff --git a/app/gimage.c b/app/gimage.c index 4eb81ca4f6..da50b455db 100644 --- a/app/gimage.c +++ b/app/gimage.c @@ -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)) {