[Bf-blender-cvs] [3546636870f] blender2.8: Eevee: SSS: Fix SSS with Add Shader node.

Clément Foucault noreply at git.blender.org
Tue Nov 14 21:34:41 CET 2017


Commit: 3546636870f9cd81319c606b5d0bac9afeff3d70
Author: Clément Foucault
Date:   Tue Nov 14 21:34:20 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB3546636870f9cd81319c606b5d0bac9afeff3d70

Eevee: SSS: Fix SSS with Add Shader node.

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

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 179d2f9096b..bd6c1923bfe 100644
--- a/source/blender/draw/engines/eevee/shaders/bsdf_common_lib.glsl
+++ b/source/blender/draw/engines/eevee/shaders/bsdf_common_lib.glsl
@@ -634,6 +634,9 @@ Closure closure_mix(Closure cl1, Closure cl2, float fac)
 Closure closure_add(Closure cl1, Closure cl2)
 {
 	Closure cl = (cl1.ssr_id == outputSsrId) ? cl1 : cl2;
+#ifdef USE_SSS
+	cl.sss_data = (cl1.sss_data.a > 0.0) ? cl1.sss_data : cl2.sss_data;
+#endif
 	cl.radiance = cl1.radiance + cl2.radiance;
 	cl.opacity = cl1.opacity + cl2.opacity;
 	return cl;



More information about the Bf-blender-cvs mailing list