seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #92344 from fire/vsk-3d-texture-alpha-4.3

Browse Source 
Fix Texture3D import not working
This commit is contained in:
Thaddeus Crews
2025-07-27 10:28:34 -05:00
parent d4f14aaa78 06a7b11a47
commit 03d648c5ad
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
scene/resources/compressed_texture.cpp
View File

@ -310,8 +310,6 @@ Ref<Image> CompressedTexture2D::load_image_from_file(Ref<FileAccess> f, int p_si
Vector<Ref<Image>> mipmap_images;
uint64_t total_size = 0;
bool first = true;
for (uint32_t i = 0; i < mipmaps + 1; i++) {
uint32_t size = f->get_32();
@ -340,14 +338,17 @@ Ref<Image> CompressedTexture2D::load_image_from_file(Ref<FileAccess> f, int p_si
if (img.is_null() || img->is_empty()) {
ERR_FAIL_COND_V(img.is_null() || img->is_empty(), Ref<Image>());
}
// If the image is compressed and its format doesn't match the desired format, return an empty reference.
// This is done to avoid recompressing the image on load.
ERR_FAIL_COND_V(img->is_compressed() && format != img->get_format(), Ref<Image>());
if (first) {
//format will actually be the format of the first image,
//as it may have changed on compression
format = img->get_format();
first = false;
} else if (img->get_format() != format) {
img->convert(format); //all needs to be the same format
// The format will actually be the format of the header,
// as it may have changed on compression.
if (format != img->get_format()) {
// Convert the image to the desired format.
// Note: We are not decompressing the image here, just changing its format.
// It's important that all images in the texture array share the same format for correct rendering.
img->convert(format);
}
total_size += img->get_data().size();