blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 762 Projects 19 Wiki Activity

Eevee: Render Fix black normals on blended material in the normal pass.

This commit is contained in:
Clément Foucault 2018-02-03 03:16:16 +01:00
parent 956a7bc3ea
commit f61bcc70e1
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
source/blender/draw/engines/eevee/shaders/bsdf_common_lib.glsl
View File

@ -685,18 +685,11 @@ Closure closure_mix(Closure cl1, Closure cl2, float fac)
{
Closure cl;
if (cl1.ssr_id == outputSsrId) {
cl.ssr_data = mix(cl1.ssr_data.xyzw, vec4(vec3(0.0), cl1.ssr_data.w), fac); /* do not blend roughness */
cl.ssr_normal = cl1.ssr_normal;
cl.ssr_id = cl1.ssr_id;
}
else {
cl.ssr_data = mix(vec4(vec3(0.0), cl2.ssr_data.w), cl2.ssr_data.xyzw, fac); /* do not blend roughness */
cl.ssr_normal = cl2.ssr_normal;
cl.ssr_id = cl2.ssr_id;
}
if (cl1.ssr_id == TRANSPARENT_CLOSURE_FLAG) {
cl1.radiance = cl2.radiance;
cl1.ssr_normal = cl2.ssr_normal;
cl1.ssr_data = cl2.ssr_data;
cl1.ssr_id = cl2.ssr_id;
# ifdef USE_SSS
cl1.sss_data = cl2.sss_data;
# ifdef USE_SSS_ALBEDO
@ -706,6 +699,9 @@ Closure closure_mix(Closure cl1, Closure cl2, float fac)
}
if (cl2.ssr_id == TRANSPARENT_CLOSURE_FLAG) {
cl2.radiance = cl1.radiance;
cl2.ssr_normal = cl1.ssr_normal;
cl2.ssr_data = cl1.ssr_data;
cl2.ssr_id = cl1.ssr_id;
# ifdef USE_SSS
cl2.sss_data = cl1.sss_data;
# ifdef USE_SSS_ALBEDO
@ -713,6 +709,16 @@ Closure closure_mix(Closure cl1, Closure cl2, float fac)
# endif
# endif
}
if (cl1.ssr_id == outputSsrId) {
cl.ssr_data = mix(cl1.ssr_data.xyzw, vec4(vec3(0.0), cl1.ssr_data.w), fac); /* do not blend roughness */
cl.ssr_normal = cl1.ssr_normal;
cl.ssr_id = cl1.ssr_id;
}
else {
cl.ssr_data = mix(vec4(vec3(0.0), cl2.ssr_data.w), cl2.ssr_data.xyzw, fac); /* do not blend roughness */
cl.ssr_normal = cl2.ssr_normal;
cl.ssr_id = cl2.ssr_id;
}
cl.radiance = mix(cl1.radiance, cl2.radiance, fac);
cl.opacity = mix(cl1.opacity, cl2.opacity, fac);