Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix Cycles AO pass not working for shadow catcher objects.

Browse Source
This commit is contained in:
Brecht Van Lommel
2018-08-20 16:09:17 +02:00
parent f52e31a46d
commit 7ffcce8607
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
intern/cycles/kernel/kernel_accumulate.h
View File

@@ -320,7 +320,13 @@ ccl_device_inline void path_radiance_accum_ao(PathRadiance *L,
float3 bsdf, float3 bsdf,
float3 ao) float3 ao)
{ {
/* Store AO pass. */
if(L->use_light_pass && state->bounce == 0) {
L->ao += alpha*throughput*ao;
}
#ifdef __SHADOW_TRICKS__ #ifdef __SHADOW_TRICKS__
/* For shadow catcher, accumulate ratio. */
if(state->flag & PATH_RAY_STORE_SHADOW_INFO) { if(state->flag & PATH_RAY_STORE_SHADOW_INFO) {
float3 light = throughput * bsdf; float3 light = throughput * bsdf;
L->path_total += light; L->path_total += light;
@@ -335,12 +341,11 @@ ccl_device_inline void path_radiance_accum_ao(PathRadiance *L,
#ifdef __PASSES__ #ifdef __PASSES__
if(L->use_light_pass) { if(L->use_light_pass) {
if(state->bounce == 0) { if(state->bounce == 0) {
/* directly visible lighting */ /* Directly visible lighting. */
L->direct_diffuse += throughput*bsdf*ao; L->direct_diffuse += throughput*bsdf*ao;
L->ao += alpha*throughput*ao;
} }
else { else {
/* indirectly visible lighting after BSDF bounce */ /* Indirectly visible lighting after BSDF bounce. */
L->indirect += throughput*bsdf*ao; L->indirect += throughput*bsdf*ao;
} }
} }