[gimp/gimp-2-8] Bug 684295: wrong layer group structure in gimp 2.8.2...
- From: Massimo Valentini <mvalentini src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gimp-2-8] Bug 684295: wrong layer group structure in gimp 2.8.2...
- Date: Mon, 4 Jan 2016 11:57:06 +0000 (UTC)
commit 9c8aeed60df4ec052ea478fa34ccfce4b6fd2a35
Author: Massimo Valentini <mvalentini src gnome org>
Date: Mon Jan 4 12:55:58 2016 +0100
Bug 684295: wrong layer group structure in gimp 2.8.2...
... (read PSD file from PS CS3)
use a position of 0 when inserting normal layers
as they're always inserted on top of their group
-1 means inside the group when the active drawable is
a group or above it when it's not. This used to work
before layer groups or in simple cases.
(cherry picked from commit 32469d53b7e28973b3c8488573341c69bef0576b)
Conflicts:
plug-ins/file-psd/psd-load.c
plug-ins/file-psd/psd-load.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/plug-ins/file-psd/psd-load.c b/plug-ins/file-psd/psd-load.c
index 35adf82..d789929 100644
--- a/plug-ins/file-psd/psd-load.c
+++ b/plug-ins/file-psd/psd-load.c
@@ -1323,7 +1323,7 @@ add_layers (const gint32 image_id,
img_a->columns, img_a->rows,
image_type, 0, GIMP_NORMAL_MODE);
g_free (lyr_a[lidx]->name);
- gimp_image_insert_layer (image_id, layer_id, parent_group_id, -1);
+ gimp_image_insert_layer (image_id, layer_id, parent_group_id, 0);
drawable = gimp_drawable_get (layer_id);
gimp_drawable_fill (drawable->drawable_id, GIMP_TRANSPARENT_FILL);
gimp_item_set_visible (drawable->drawable_id, lyr_a[lidx]->layer_flags.visible);
@@ -1360,7 +1360,7 @@ add_layers (const gint32 image_id,
layer_mode);
IFDBG(3) g_debug ("Layer tattoo: %d", layer_id);
g_free (lyr_a[lidx]->name);
- gimp_image_insert_layer (image_id, layer_id, parent_group_id, -1);
+ gimp_image_insert_layer (image_id, layer_id, parent_group_id, 0);
gimp_layer_set_offsets (layer_id, l_x, l_y);
gimp_layer_set_lock_alpha (layer_id, lyr_a[lidx]->layer_flags.trans_prot);
drawable = gimp_drawable_get (layer_id);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]