[Bf-blender-cvs] [b522e4b] compositor-2016: Fix T48514: Cycles toon glossy BSDF not respecting reflective caustics option.

[Brecht Van Lommel]

Commit: b522e4b7cfb7762f86a29e891336a923ce25535a
Author: Brecht Van Lommel
Date:   Wed May 25 21:10:36 2016 +0200
Branches: compositor-2016
https://developer.blender.org/rBb522e4b7cfb7762f86a29e891336a923ce25535a

Fix T48514: Cycles toon glossy BSDF not respecting reflective caustics option.

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

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 8839700..65512a0 100644
--- a/intern/cycles/kernel/svm/svm_closure.h
+++ b/intern/cycles/kernel/svm/svm_closure.h
@@ -365,8 +365,12 @@ ccl_device void svm_node_closure_bsdf(KernelGlobals *kg, ShaderData *sd, float *
 			}
 			break;
 		}
-		case CLOSURE_BSDF_DIFFUSE_TOON_ID:
-		case CLOSURE_BSDF_GLOSSY_TOON_ID: {
+		case CLOSURE_BSDF_GLOSSY_TOON_ID:
+#ifdef __CAUSTICS_TRICKS__
+			if(!kernel_data.integrator.caustics_reflective && (path_flag & PATH_RAY_DIFFUSE))
+				break;
+#endif
+		case CLOSURE_BSDF_DIFFUSE_TOON_ID: {
 			ShaderClosure *sc = svm_node_closure_get_bsdf(sd, mix_weight);
 
 			if(sc) {