From ae49a36f4677bb43461c2eaa840a9781ff0aca20 Mon Sep 17 00:00:00 2001 From: scott Date: Mon, 26 Jan 1998 02:33:05 +0000 Subject: [PATCH] Fixed merge bug. --sg Fixed merge bug. --sg --- ChangeLog | 3 +++ app/gimage.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ef5309d65f..6e8aa7eb42 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ Sun Jan 25 16:56:49 1998 Scott Goehring + * app/gimage.c (gimage_merge_layers): Added a missing call to + drawable_offsets, fixing the "merge bug". + * app/gimage_cmds.c (duplicate): Fixed a bug in duplicate that was entirely my fault. :) diff --git a/app/gimage.c b/app/gimage.c index 8fe3970e6b..ead711156b 100644 --- a/app/gimage.c +++ b/app/gimage.c @@ -1871,6 +1871,7 @@ gimage_merge_layers (GImage *gimage, link_ptr merge_list, MergeType merge_type) while (merge_list) { layer = (Layer *) merge_list->data; + drawable_offsets (GIMP_DRAWABLE(layer), &off_x, &off_y); switch (merge_type) { @@ -1905,7 +1906,6 @@ gimage_merge_layers (GImage *gimage, link_ptr merge_list, MergeType merge_type) case ClipToBottomLayer: if (merge_list->next == NULL) { - drawable_offsets (GIMP_DRAWABLE(layer), &off_x, &off_y); x1 = off_x; y1 = off_y; x2 = off_x + drawable_width (GIMP_DRAWABLE(layer));