[Bf-blender-cvs] [81b129d] master: Cycles-Bake: fix T40322 Glitch in baking a mixed SSS shader

Dalai Felinto noreply at git.blender.org
Fri May 23 00:47:55 CEST 2014


Commit: 81b129d3b837e31c0d6d2a9d2a6e39d39e47c1ec
Author: Dalai Felinto
Date:   Thu May 22 19:46:18 2014 -0300
https://developer.blender.org/rB81b129d3b837e31c0d6d2a9d2a6e39d39e47c1ec

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

If we are using a mix node we still need to evaluate the BSDF lighting
even if scattering is successful.

Note: this was working for branched path (probably an oversight when
branched path support was introduced for baking, a good oversight though
;)

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

M	intern/cycles/kernel/kernel_bake.h

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

diff --git a/intern/cycles/kernel/kernel_bake.h b/intern/cycles/kernel/kernel_bake.h
index b64c5ce..5d7f930 100644
--- a/intern/cycles/kernel/kernel_bake.h
+++ b/intern/cycles/kernel/kernel_bake.h
@@ -58,9 +58,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 */
-				if (kernel_path_subsurface_scatter(kg, sd, &L_sample, &state, &rng, &ray, &throughput))
-					is_sss = true;
+				kernel_path_subsurface_scatter(kg, sd, &L_sample, &state, &rng, &ray, &throughput);
 			}
 #endif
 
@@ -97,7 +95,6 @@ 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




More information about the Bf-blender-cvs mailing list