griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T99565: Cycles reading TGA files with alpha different than Blender

Browse Source 
Thanks to Lukas for tracking down the cause in OIIO.
This commit is contained in:
Brecht Van Lommel
2022-10-17 14:20:42 +02:00
parent 3eaf2b7fc6
commit 0a35afbf86
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
intern/cycles/scene/image_oiio.cpp
View File

@@ -192,8 +192,17 @@ bool OIIOImageLoader::load_pixels(const ImageMetaData &metadata,
return false;
}
const bool do_associate_alpha = associate_alpha &&
spec.get_int_attribute("oiio:UnassociatedAlpha", 0);
bool do_associate_alpha = false;
if (associate_alpha) {
do_associate_alpha = spec.get_int_attribute("oiio:UnassociatedAlpha", 0);
/* Workaround OIIO not detecting TGA file alpha the same as Blender (since #3019).
* We want anything not marked as premultiplied alpha to get associated. */
if (!do_associate_alpha && spec.alpha_channel != -1 &&
strcmp(in->format_name(), "targa") == 0) {
do_associate_alpha = spec.get_int_attribute("targa:alpha_type", -1) != 4;
}
}
switch (metadata.type) {
case IMAGE_DATA_TYPE_BYTE: