tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Fix #113058: Cycles: Bump mapping causing dark edges with subsurface 

The refractive entry bounce does not like being below the shading normal,
so use the existing clamping logic.
This commit is contained in:
Lukas Stockner 2023-10-04 13:23:45 +02:00
parent 93aa1654be
commit d071e0a5fc
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/kernel/osl/closures_setup.h
View File

@ -830,7 +830,7 @@ ccl_device void osl_closure_bssrdf_setup(KernelGlobals kg,
/* create one closure per color channel */ /* create one closure per color channel */
bssrdf->albedo = closure->albedo; bssrdf->albedo = closure->albedo;
bssrdf->N = closure->N; bssrdf->N = maybe_ensure_valid_specular_reflection(sd, closure->N);
bssrdf->alpha = sqr(closure->roughness); bssrdf->alpha = sqr(closure->roughness);
bssrdf->ior = closure->ior; bssrdf->ior = closure->ior;
bssrdf->anisotropy = closure->anisotropy; bssrdf->anisotropy = closure->anisotropy;

4
intern/cycles/kernel/svm/closure.h
View File

@ -381,7 +381,7 @@ ccl_device
bssrdf->radius = rgb_to_spectrum(subsurface_radius * subsurface_scale); bssrdf->radius = rgb_to_spectrum(subsurface_radius * subsurface_scale);
bssrdf->albedo = rgb_to_spectrum(base_color); bssrdf->albedo = rgb_to_spectrum(base_color);
bssrdf->N = N; bssrdf->N = maybe_ensure_valid_specular_reflection(sd, N);
bssrdf->alpha = sqr(roughness); bssrdf->alpha = sqr(roughness);
bssrdf->ior = ior; bssrdf->ior = ior;
bssrdf->anisotropy = stack_load_float(stack, data_subsurf.w); bssrdf->anisotropy = stack_load_float(stack, data_subsurf.w);
@ -834,7 +834,7 @@ ccl_device
if (bssrdf) { if (bssrdf) {
bssrdf->radius = rgb_to_spectrum(stack_load_float3(stack, data_node.z) * param1); bssrdf->radius = rgb_to_spectrum(stack_load_float3(stack, data_node.z) * param1);
bssrdf->albedo = closure_weight; bssrdf->albedo = closure_weight;
bssrdf->N = N; bssrdf->N = maybe_ensure_valid_specular_reflection(sd, N);
bssrdf->ior = param2; bssrdf->ior = param2;
bssrdf->alpha = 1.0f; bssrdf->alpha = 1.0f;
bssrdf->anisotropy = stack_load_float(stack, data_node.w); bssrdf->anisotropy = stack_load_float(stack, data_node.w);