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/split/kernel_subsurface_scatter.h | |
| parent | 847b21ee08e5a30a2fe35ede4c5b3a73af404af7 (diff) | |
Fix T54962: Cycles crash using subsurface scattering texture blur.
Diffstat (limited to 'intern/cycles/kernel/split/kernel_subsurface_scatter.h')
| -rw-r--r-- | intern/cycles/kernel/split/kernel_subsurface_scatter.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/intern/cycles/kernel/split/kernel_subsurface_scatter.h b/intern/cycles/kernel/split/kernel_subsurface_scatter.h index af0303d8608..c51246fbc90 100644 --- a/intern/cycles/kernel/split/kernel_subsurface_scatter.h +++ b/intern/cycles/kernel/split/kernel_subsurface_scatter.h @@ -110,13 +110,18 @@ ccl_device_noinline bool kernel_split_branched_path_subsurface_indirect_light_it *bssrdf_sd = *sd; /* note: copy happens each iteration of inner loop, this is * important as the indirect path will write into bssrdf_sd */ + Bssrdf *bssrdf = (Bssrdf *)sc; + ClosureType bssrdf_type = sc->type; + float bssrdf_roughness = bssrdf->roughness; + LocalIntersection ss_isect_private = *ss_isect; subsurface_scatter_multi_setup(kg, &ss_isect_private, hit, bssrdf_sd, hit_state, - sc); + bssrdf_type, + bssrdf_roughness); *ss_isect = ss_isect_private; #ifdef __VOLUME__ |