diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-04-03 20:12:13 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-04-03 20:12:13 +0400 |
| commit | 743552ff2a4c1ce057934e0c5b22a0e48d08c749 (patch) | |
| tree | a0b71a325461cb6fd1265234f160f80ce4fd98e3 /intern/cycles/kernel/kernel_path.h | |
| parent | 9c49e71216c11d3369eb40b8b743c555b032e397 (diff) | |
Fix #34852: multilayer SSS material rendering different in progressive and
non-progressive integrator.
Diffstat (limited to 'intern/cycles/kernel/kernel_path.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_path.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/kernel/kernel_path.h b/intern/cycles/kernel/kernel_path.h index f64a4306aeb..7aa1ec365b7 100644 --- a/intern/cycles/kernel/kernel_path.h +++ b/intern/cycles/kernel/kernel_path.h @@ -363,7 +363,7 @@ __device float4 kernel_path_progressive(KernelGlobals *kg, RNG *rng, int sample, /* do bssrdf scatter step if we picked a bssrdf closure */ if(sc) { uint lcg_state = lcg_init(rbsdf); - subsurface_scatter_step(kg, &sd, state.flag, sc, &lcg_state); + subsurface_scatter_step(kg, &sd, state.flag, sc, &lcg_state, false); } } #endif @@ -587,7 +587,7 @@ __device void kernel_path_indirect(KernelGlobals *kg, RNG *rng, int sample, Ray /* do bssrdf scatter step if we picked a bssrdf closure */ if(sc) { uint lcg_state = lcg_init(rbsdf); - subsurface_scatter_step(kg, &sd, state.flag, sc, &lcg_state); + subsurface_scatter_step(kg, &sd, state.flag, sc, &lcg_state, false); } } #endif @@ -996,7 +996,7 @@ __device float4 kernel_path_non_progressive(KernelGlobals *kg, RNG *rng, int sam * replace the BSSRDF with a diffuse BSDF closure */ for(int j = 0; j < num_samples; j++) { ShaderData bssrdf_sd = sd; - subsurface_scatter_step(kg, &bssrdf_sd, state.flag, sc, &lcg_state); + subsurface_scatter_step(kg, &bssrdf_sd, state.flag, sc, &lcg_state, true); /* compute lighting with the BSDF closure */ kernel_path_non_progressive_lighting(kg, rng, sample*num_samples + j, |