diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-03 19:08:46 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-03 19:10:37 +0300 |
| commit | fffdedbcc13aa68ddb0c5f4ffd725e3ba0ea4a36 (patch) | |
| tree | 21461a0212708e94536bebfb1e0a45a875f94538 /intern/cycles/kernel/kernel_path_branched.h | |
| parent | 847b21ee08e5a30a2fe35ede4c5b3a73af404af7 (diff) | |
Fix T54962: Cycles crash using subsurface scattering texture blur.
Diffstat (limited to 'intern/cycles/kernel/kernel_path_branched.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_path_branched.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/intern/cycles/kernel/kernel_path_branched.h b/intern/cycles/kernel/kernel_path_branched.h index 80fcf5b0565..21da4d9308b 100644 --- a/intern/cycles/kernel/kernel_path_branched.h +++ b/intern/cycles/kernel/kernel_path_branched.h @@ -368,12 +368,16 @@ ccl_device void kernel_branched_path_subsurface_scatter(KernelGlobals *kg, /* compute lighting with the BSDF closure */ for(int hit = 0; hit < num_hits; hit++) { ShaderData bssrdf_sd = *sd; + Bssrdf *bssrdf = (Bssrdf *)sc; + ClosureType bssrdf_type = sc->type; + float bssrdf_roughness = bssrdf->roughness; subsurface_scatter_multi_setup(kg, &ss_isect, hit, &bssrdf_sd, &hit_state, - sc); + bssrdf_type, + bssrdf_roughness); #ifdef __VOLUME__ if(need_update_volume_stack) { |