[Bf-blender-cvs] [0c4740735c5] blender2.8: Eevee: Fix SSS mixing with transparent bsdf

[Clément Foucault]

Commit: 0c4740735c5215a1e97ae8bb29cb74bcd472264e
Author: Clément Foucault
Date:   Sat Nov 25 17:40:05 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB0c4740735c5215a1e97ae8bb29cb74bcd472264e

Eevee: Fix SSS mixing with transparent bsdf

===================================================================

M	source/blender/draw/engines/eevee/shaders/bsdf_common_lib.glsl

===================================================================

diff --git a/source/blender/draw/engines/eevee/shaders/bsdf_common_lib.glsl b/source/blender/draw/engines/eevee/shaders/bsdf_common_lib.glsl
index f02812e3e6e..aecb1e6dde4 100644
--- a/source/blender/draw/engines/eevee/shaders/bsdf_common_lib.glsl
+++ b/source/blender/draw/engines/eevee/shaders/bsdf_common_lib.glsl
@@ -612,14 +612,6 @@ Closure closure_mix(Closure cl1, Closure cl2, float fac)
 {
 	Closure cl;
 
-#ifdef USE_SSS
-	cl.sss_data.rgb = mix(cl1.sss_data.rgb, cl2.sss_data.rgb, fac);
-	cl.sss_data.a = (cl1.sss_data.a > 0.0) ? cl1.sss_data.a : cl2.sss_data.a;
-#ifdef USE_SSS_ALBEDO
-	cl.sss_albedo = (cl1.sss_data.a > 0.0) ? cl1.sss_albedo : cl2.sss_albedo;
-#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;
@@ -633,12 +625,34 @@ Closure closure_mix(Closure cl1, Closure cl2, float fac)
 	}
 	if (cl1.ssr_id == TRANSPARENT_CLOSURE_FLAG) {
 		cl1.radiance = cl2.radiance;
+#ifdef USE_SSS
+		cl1.sss_data = cl2.sss_data;
+#ifdef USE_SSS_ALBEDO
+		cl1.sss_albedo = cl2.sss_albedo;
+#endif
+#endif
 	}
 	if (cl2.ssr_id == TRANSPARENT_CLOSURE_FLAG) {
 		cl2.radiance = cl1.radiance;
+#ifdef USE_SSS
+		cl2.sss_data = cl1.sss_data;
+#ifdef USE_SSS_ALBEDO
+		cl2.sss_albedo = cl1.sss_albedo;
+#endif
+#endif
 	}
 	cl.radiance = mix(cl1.radiance, cl2.radiance, fac);
 	cl.opacity = mix(cl1.opacity, cl2.opacity, fac);
+
+#ifdef USE_SSS
+	cl.sss_data.rgb = mix(cl1.sss_data.rgb, cl2.sss_data.rgb, fac);
+	cl.sss_data.a = (cl1.sss_data.a > 0.0) ? cl1.sss_data.a : cl2.sss_data.a;
+#ifdef USE_SSS_ALBEDO
+	/* TODO Find a solution to this. Dither? */
+	cl.sss_albedo = (cl1.sss_data.a > 0.0) ? cl1.sss_albedo : cl2.sss_albedo;
+#endif
+#endif
+
 	return cl;
 }
 
@@ -648,6 +662,7 @@ Closure closure_add(Closure cl1, Closure cl2)
 #ifdef USE_SSS
 	cl.sss_data = (cl1.sss_data.a > 0.0) ? cl1.sss_data : cl2.sss_data;
 #ifdef USE_SSS_ALBEDO
+	/* TODO Find a solution to this. Dither? */
 	cl.sss_albedo = (cl1.sss_data.a > 0.0) ? cl1.sss_albedo : cl2.sss_albedo;
 #endif
 #endif