bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Cycles: Fix SSS object not properly reflected in glossy object with indirect clamping

Browse Source 
This fixes remained issues reported in T46908.
This commit is contained in:
Sergey Sharybin 2015-12-02 15:59:12 +05:00
parent 3cd36f85b0
commit d0a9ec5efc
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -339,6 +339,23 @@ ccl_device_inline void path_radiance_reset_indirect(PathRadiance *L)
#endif
}
ccl_device_inline void path_radiance_copy_indirect(PathRadiance *L,
const PathRadiance *L_src)
{
#ifdef __PASSES__
if(L->use_light_pass) {
L->path_diffuse = L_src->path_diffuse;
L->path_glossy = L_src->path_glossy;
L->path_transmission = L_src->path_transmission;
L->path_subsurface = L_src->path_subsurface;
L->path_scatter = L_src->path_scatter;
L->direct_emission = L_src->direct_emission;
L->indirect = L_src->indirect;
}
#endif
}
ccl_device_inline float3 path_radiance_clamp_and_sum(KernelGlobals *kg, PathRadiance *L)
{
float3 L_sum;

5
intern/cycles/kernel/kernel_path.h
View File

@ -497,6 +497,9 @@ ccl_device bool kernel_path_subsurface_scatter(
hit_state->rng_offset += PRNG_BOUNCE_NUM;
path_radiance_init(hit_L, kernel_data.film.use_light_pass);
hit_L->direct_throughput = L->direct_throughput;
path_radiance_copy_indirect(hit_L, L);
kernel_path_surface_connect_light(kg, rng, sd, *hit_tp, state, hit_L);
if(kernel_path_surface_bounce(kg,
@ -524,7 +527,7 @@ ccl_device bool kernel_path_subsurface_scatter(
hit_state->volume_stack);
}
#endif
path_radiance_reset_indirect(L);
ss_indirect->num_rays++;
}
else {