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

Merge pull request #106486 from BlueCube3310/image-ch-detect-fix

Browse Source 
Image: Fix detecting color channels
This commit is contained in:
Thaddeus Crews
2025-05-19 08:01:40 -05:00
parent 0f21ccd4b8 0f9986470a
commit a2aefab4c7
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
core/io/image.cpp
View File

@ -3464,18 +3464,24 @@ Image::UsedChannels Image::detect_used_channels(CompressSource p_source) const {
UsedChannels used_channels;
if (!c && !a) {
used_channels = USED_CHANNELS_L;
} else if (!c && a) {
used_channels = USED_CHANNELS_LA;
} else if (r && !g && !b && !a) {
used_channels = USED_CHANNELS_R;
} else if (r && g && !b && !a) {
used_channels = USED_CHANNELS_RG;
} else if (r && g && b && !a) {
used_channels = USED_CHANNELS_RGB;
if (!c) {
// Uniform RGB (grayscale).
if (a) {
used_channels = USED_CHANNELS_LA;
} else {
used_channels = USED_CHANNELS_L;
}
} else {
used_channels = USED_CHANNELS_RGBA;
// Colored image.
if (a) {
used_channels = USED_CHANNELS_RGBA;
} else if (b) {
used_channels = USED_CHANNELS_RGB;
} else if (g) {
used_channels = USED_CHANNELS_RG;
} else {
used_channels = USED_CHANNELS_R;
}
}
if (p_source == COMPRESS_SOURCE_SRGB && (used_channels == USED_CHANNELS_R || used_channels == USED_CHANNELS_RG)) {