[Bf-blender-cvs] [b3f9117] master: Revert "Cycles-Bake: fix T40322 Glitch in baking a mixed SSS shader"

[Dalai Felinto]

Commit: b3f9117523d33568c6a8df1a34bbb695d3d53e1e
Author: Dalai Felinto
Date:   Sat May 24 14:21:18 2014 -0300
https://developer.blender.org/rBb3f9117523d33568c6a8df1a34bbb695d3d53e1e

Revert "Cycles-Bake: fix T40322 Glitch in baking a mixed SSS shader"

This reverts commit 81b129d3b837e31c0d6d2a9d2a6e39d39e47c1ec.

This is not the correct fix yet. More details in T40322

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

M	intern/cycles/kernel/kernel_bake.h

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

diff --git a/intern/cycles/kernel/kernel_bake.h b/intern/cycles/kernel/kernel_bake.h
index 5d7f930..b64c5ce 100644
--- a/intern/cycles/kernel/kernel_bake.h
+++ b/intern/cycles/kernel/kernel_bake.h
@@ -58,7 +58,9 @@ ccl_device void compute_light_pass(KernelGlobals *kg, ShaderData *sd, PathRadian
 #ifdef __SUBSURFACE__
 			/* sample subsurface scattering */
 			if((is_combined || is_sss) && (sd->flag & SD_BSSRDF)) {
-				kernel_path_subsurface_scatter(kg, sd, &L_sample, &state, &rng, &ray, &throughput);
+				/* when mixing BSSRDF and BSDF closures we should skip BSDF lighting if scattering was successful */
+				if (kernel_path_subsurface_scatter(kg, sd, &L_sample, &state, &rng, &ray, &throughput))
+					is_sss = true;
 			}
 #endif
 
@@ -95,6 +97,7 @@ ccl_device void compute_light_pass(KernelGlobals *kg, ShaderData *sd, PathRadian
 #ifdef __SUBSURFACE__
 			/* sample subsurface scattering */
 			if((is_combined || is_sss) && (sd->flag & SD_BSSRDF)) {
+				/* when mixing BSSRDF and BSDF closures we should skip BSDF lighting if scattering was successful */
 				kernel_branched_path_subsurface_scatter(kg, sd, &L_sample, &state, &rng, throughput);
 			}
 #endif