Fix T93711: Cycles diffuse/glossy baking does not write alpha

With the change to use render passes internally the alpha channel got lost.
Add support for these render passes to output an alpha channel for baking.
This commit is contained in:
Brecht Van Lommel
2022-01-20 22:31:21 +01:00
parent 14d261d23a
commit 1ac2d2dcb6
2 changed files with 20 additions and 2 deletions

View File

@@ -214,6 +214,21 @@ ccl_device_inline void film_get_pass_pixel_light_path(
pixel[0] = f.x;
pixel[1] = f.y;
pixel[2] = f.z;
/* Optional alpha channel. */
if (kfilm_convert->num_components >= 4) {
if (kfilm_convert->pass_combined != PASS_UNUSED) {
float scale, scale_exposure;
film_get_scale_and_scale_exposure(kfilm_convert, buffer, &scale, &scale_exposure);
ccl_global const float *in_combined = buffer + kfilm_convert->pass_combined;
const float alpha = in_combined[3] * scale;
pixel[3] = film_transparency_to_alpha(alpha);
}
else {
pixel[3] = 1.0f;
}
}
}
ccl_device_inline void film_get_pass_pixel_float3(ccl_global const KernelFilmConvert *ccl_restrict