sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Eevee: Principled: Fix Subsurface input behaviour

Browse Source 
Match Cycles behaviour of scalling the SSS radius and don't interpolate
between diffuse and SSS result.
This commit is contained in:
Clément Foucault 2018-07-21 18:15:31 +02:00
parent e361e9e99c
commit f07140940c
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
source/blender/gpu/shaders/gpu_shader_material.glsl
View File

@ -1145,15 +1145,18 @@ void node_bsdf_principled_clearcoat(vec4 base_color, float subsurface, vec3 subs
clearcoat *= 0.25; clearcoat *= 0.25;
clearcoat *= 1.0 - transmission; clearcoat *= 1.0 - transmission;
vec3 mixed_ss_base_color = mix(diffuse, subsurface_color.rgb, subsurface);
#ifdef USE_SSS #ifdef USE_SSS
diffuse = mix(diffuse, vec3(0.0), subsurface); diffuse = vec3(0.0);
#else #else
diffuse = mix(diffuse, subsurface_color.rgb, subsurface); diffuse = mixed_ss_base_color;
#endif #endif
f0 = mix(f0, vec3(1.0), transmission); f0 = mix(f0, vec3(1.0), transmission);
float sss_scalef = dot(sss_scale, vec3(1.0 / 3.0)); float sss_scalef = dot(sss_scale, vec3(1.0 / 3.0)) * subsurface;
eevee_closure_principled(N, diffuse, f0, int(ssr_id), roughness, eevee_closure_principled(N, mixed_ss_base_color, f0, int(ssr_id), roughness,
CN, clearcoat, clearcoat_roughness, 1.0, sss_scalef, ior, CN, clearcoat, clearcoat_roughness, 1.0, sss_scalef, ior,
out_diff, out_trans, out_spec, out_refr, ssr_spec); out_diff, out_trans, out_spec, out_refr, ssr_spec);
@ -1177,11 +1180,11 @@ void node_bsdf_principled_clearcoat(vec4 base_color, float subsurface, vec3 subs
#ifdef USE_SSS #ifdef USE_SSS
result.sss_data.a = sss_scalef; result.sss_data.a = sss_scalef;
result.sss_data.rgb = out_diff + out_trans; result.sss_data.rgb = out_diff + out_trans;
#ifdef USE_SSS_ALBEDO # ifdef USE_SSS_ALBEDO
result.sss_albedo.rgb = mix(vec3(0.0), subsurface_color.rgb, subsurface); result.sss_albedo.rgb = mixed_ss_base_color;
#else # else
result.sss_data.rgb *= mix(vec3(0.0), subsurface_color.rgb, subsurface); result.sss_data.rgb *= mixed_ss_base_color;
#endif # endif
result.sss_data.rgb *= (1.0 - transmission); result.sss_data.rgb *= (1.0 - transmission);
#endif #endif
} }