archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cycles: support shader transparency for holdout objects

Browse Source 
Now transparent areas of the object will render objects behind.

Fixes T78728.
This commit is contained in:
Brecht Van Lommel
2020-07-08 12:57:59 +02:00
parent 643196cc37
commit 6435acd8f6
2 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
intern/cycles/kernel/kernel_shader.h
View File

@@ -1017,15 +1017,36 @@ ccl_device float3 shader_emissive_eval(ShaderData *sd)
/* Holdout */
ccl_device float3 shader_holdout_eval(KernelGlobals *kg, ShaderData *sd)
ccl_device float3 shader_holdout_apply(KernelGlobals *kg, ShaderData *sd)
{
float3 weight = make_float3(0.0f, 0.0f, 0.0f);
for (int i = 0; i < sd->num_closure; i++) {
ShaderClosure *sc = &sd->closure[i];
/* For objects marked as holdout, preserve transparency and remove all other
* closures, replacing them with a holdout weight. */
if (sd->object_flag & SD_OBJECT_HOLDOUT_MASK) {
if ((sd->flag & SD_TRANSPARENT) && !(sd->flag & SD_HAS_ONLY_VOLUME)) {
weight = make_float3(1.0f, 1.0f, 1.0f) - sd->closure_transparent_extinction;
if (CLOSURE_IS_HOLDOUT(sc->type))
weight += sc->weight;
for (int i = 0; i < sd->num_closure; i++) {
ShaderClosure *sc = &sd->closure[i];
if (!CLOSURE_IS_BSDF_TRANSPARENT(sc->type)) {
sc->type = NBUILTIN_CLOSURES;
}
}
sd->flag &= ~(SD_CLOSURE_FLAGS - (SD_TRANSPARENT | SD_BSDF));
}
else {
weight = make_float3(1.0f, 1.0f, 1.0f);
}
}
else {
for (int i = 0; i < sd->num_closure; i++) {
ShaderClosure *sc = &sd->closure[i];
if (CLOSURE_IS_HOLDOUT(sc->type)) {
weight += sc->weight;
}
}
}
return weight;