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

plug-ins: Fix check for DDS cubemap option 

Our DDS plug-in checks to see if we have six layers
with certain labels in their name to create a cubemap,
and if we don't, that option is locked.
When porting to GIMP 3 API, we accidentally kept checking
only the first layer's name instead of all six+ layers, thus
making it impossible to verify we had layers with the right labels.

This patch adjusts the iteration code to ensure we check all layers
in the image and not just the name of the first one.
This commit is contained in:
Alx Sa 2025-03-30 12:49:07 +00:00
parent 1918259ef6
commit 238d0b3d31
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
plug-ins/file-dds/ddswrite.c
View File

@ -204,8 +204,7 @@ check_mipmaps (gint savetype)
static gboolean
check_cubemap (GimpImage *image)
{
GList *layers;
GList *list;
GimpLayer **layers;
gint num_layers;
gboolean cubemap = TRUE;
gint i, j, k;
@ -213,11 +212,14 @@ check_cubemap (GimpImage *image)
gchar *layer_name;
GimpImageType type;
layers = gimp_image_list_layers (image);
num_layers = g_list_length (layers);
layers = gimp_image_get_layers (image);
num_layers = gimp_core_object_array_get_length ((GObject **) layers);
if (num_layers < 6)
return FALSE;
{
g_free (layers);
return FALSE;
}
/* Check for a valid cubemap with mipmap layers */
if (num_layers > 6)
@ -234,11 +236,9 @@ check_cubemap (GimpImage *image)
w = gimp_image_get_width (image);
h = gimp_image_get_height (image);
for (i = 0, list = layers;
i < num_layers;
++i, list = g_list_next (list))
for (i = 0; i < num_layers; ++i)
{
GimpDrawable *drawable = list->data;
GimpDrawable *drawable = GIMP_DRAWABLE (layers[i]);
if ((gimp_drawable_get_width (drawable) != w) ||
(gimp_drawable_get_height (drawable) != h))
@ -289,13 +289,9 @@ check_cubemap (GimpImage *image)
for (i = 0; i < 6; ++i)
cubemap_faces[i] = NULL;
for (i = 0, list = layers;
i < 6;
++i, list = g_list_next (layers))
for (i = 0; i < num_layers; ++i)
{
GimpLayer *layer = list->data;
layer_name = (gchar *) gimp_item_get_name (GIMP_ITEM (layer));
layer_name = (gchar *) gimp_item_get_name (GIMP_ITEM (layers[i]));
for (j = 0; j < 6; ++j)
{
@ -305,7 +301,7 @@ check_cubemap (GimpImage *image)
{
if (cubemap_faces[j] == NULL)
{
cubemap_faces[j] = layer;
cubemap_faces[j] = layers[i];
break;
}
}
@ -348,6 +344,7 @@ check_cubemap (GimpImage *image)
}
}
}
g_free (layers);
return cubemap;
}