diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-11-28 17:43:54 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-11-28 18:07:34 +0300 |
commit | f5d1551b6e29eebf0c9e1f0884e0b0571d358e34 (patch) | |
tree | 4132b899a7b8d2c4e543b9f1e0631fdcf3aaa4a4 /intern/cycles/kernel/kernel_bake.h | |
parent | 1e43f0d74216cc936e6a708be321ba2c05b66ca1 (diff) |
Cycles: Fix wrong original ray used for SSS baking
Also de-duplicated some code by moving to an utility function.
Diffstat (limited to 'intern/cycles/kernel/kernel_bake.h')
-rw-r--r-- | intern/cycles/kernel/kernel_bake.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/kernel/kernel_bake.h b/intern/cycles/kernel/kernel_bake.h index a04e759f6eb..c2845db8b57 100644 --- a/intern/cycles/kernel/kernel_bake.h +++ b/intern/cycles/kernel/kernel_bake.h @@ -65,8 +65,8 @@ ccl_device void compute_light_pass(KernelGlobals *kg, ShaderData *sd, PathRadian if((is_combined || is_sss_sample) && (sd->flag & SD_BSSRDF)) { /* when mixing BSSRDF and BSDF closures we should skip BSDF lighting if scattering was successful */ SubsurfaceIndirectRays ss_indirect; - ss_indirect.tracing = false; - ss_indirect.num_rays = 0; + Ray orig_ray = ray; + kernel_path_subsurface_init_indirect(&ss_indirect); if(kernel_path_subsurface_scatter(kg, sd, &L_sample, @@ -79,7 +79,7 @@ ccl_device void compute_light_pass(KernelGlobals *kg, ShaderData *sd, PathRadian while(ss_indirect.num_rays) { kernel_path_subsurface_setup_indirect(kg, &ss_indirect, - &ray, + &orig_ray, &state, &ray, &L_sample, |