diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 08:16:47 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 08:16:47 +0000 |
commit | 839c46e19ac4aa00b619a185ad48ee977162ef2c (patch) | |
tree | 01f1e79a4e164244941361adb0cf062098537f12 /plug-ins/file-psd/psd-load.c | |
parent | Adding debian version 2.10.36-3. (diff) | |
download | gimp-839c46e19ac4aa00b619a185ad48ee977162ef2c.tar.xz gimp-839c46e19ac4aa00b619a185ad48ee977162ef2c.zip |
Merging upstream version 2.10.38.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'plug-ins/file-psd/psd-load.c')
-rw-r--r-- | plug-ins/file-psd/psd-load.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/plug-ins/file-psd/psd-load.c b/plug-ins/file-psd/psd-load.c index b03f8cf..54b72d1 100644 --- a/plug-ins/file-psd/psd-load.c +++ b/plug-ins/file-psd/psd-load.c @@ -1330,7 +1330,15 @@ add_layers (gint32 image_id, */ if (lidx > 0) { - if (gidx == -1) + if (lyr_a[lidx]->group_type != 0) + { + /* Ignoring group layers with clipping set for now. */ + IFDBG(3) g_debug ("Group Layer with clipping: [%d] %s", + lidx, lyr_a[lidx]->name); + use_clipping_group = FALSE; + gidx = -1; + } + else if (gidx == -1) { use_clipping_group = TRUE; |