[Bf-blender-cvs] [c10b484] cycles_disney_brdf: Rollback attempt to fix sss crashing, it prevented crash by disabling sss completely, thus useless

[Jens Verwiebe]

Commit: c10b484dcad3412c34455736e9656cd38716bcb0
Author: Jens Verwiebe
Date:   Fri Jul 22 01:15:21 2016 +0200
Branches: cycles_disney_brdf
https://developer.blender.org/rBc10b484dcad3412c34455736e9656cd38716bcb0

Rollback attempt to fix sss crashing, it prevented crash by disabling sss completely, thus useless

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

M	intern/cycles/kernel/svm/svm_closure.h

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

diff --git a/intern/cycles/kernel/svm/svm_closure.h b/intern/cycles/kernel/svm/svm_closure.h
index 2b1a081..64a290d 100644
--- a/intern/cycles/kernel/svm/svm_closure.h
+++ b/intern/cycles/kernel/svm/svm_closure.h
@@ -187,13 +187,6 @@ ccl_device void svm_node_closure_bsdf(KernelGlobals *kg, ShaderData *sd, float *
 			float3 weight = sc->weight;
 			float sample_weight = sc->sample_weight;
 
-#ifdef __BSDF_DISNEY_DIFFUSE__
-#  ifndef __SPLIT_KERNEL__
-#    define sc_next(sc) sc++
-#  else
-#    define sc_next(sc) sc = ccl_fetch_array(sd, closure, ccl_fetch(sd, num_closure))
-#  endif
-
 			/* subsurface */
 			float3 albedo = baseColor;
 			float3 subsurf_weight = baseColor * sc->weight * mix_weight * subsurface * diffuse_weight;
@@ -222,7 +215,6 @@ ccl_device void svm_node_closure_bsdf(KernelGlobals *kg, ShaderData *sd, float *
 					ccl_fetch(sd, flag) |= bssrdf_setup(sc, (ClosureType)CLOSURE_BSSRDF_BURLEY_ID);
 
 					ccl_fetch(sd, num_closure)++;
-					sc_next(sc);
 				}
 
 				if (fabsf(subsurf_weight.y) > 0.0f) {
@@ -241,7 +233,6 @@ ccl_device void svm_node_closure_bsdf(KernelGlobals *kg, ShaderData *sd, float *
 					ccl_fetch(sd, flag) |= bssrdf_setup(sc, (ClosureType)CLOSURE_BSSRDF_BURLEY_ID);
 
 					ccl_fetch(sd, num_closure)++;
-					sc_next(sc);
 				}
 
 				if (fabsf(subsurf_weight.z) > 0.0f) {
@@ -260,13 +251,9 @@ ccl_device void svm_node_closure_bsdf(KernelGlobals *kg, ShaderData *sd, float *
 					ccl_fetch(sd, flag) |= bssrdf_setup(sc, (ClosureType)CLOSURE_BSSRDF_BURLEY_ID);
 
 					ccl_fetch(sd, num_closure)++;
-					sc_next(sc);
 				}
 			}
 
-#  undef sc_next
-#endif // __BSDF_DISNEY_DIFFUSE__
-
 			/* diffuse */
 			if (metallic < 1.0f) {
 				if (ccl_fetch(sd, num_closure) < MAX_CLOSURE) {