[Bf-blender-cvs] [1a613e5796a] split-kernel-faster-building: Cycles: Fix rendering of barbershop scene

[Mai Lavelle]

Commit: 1a613e5796ab2edfc40ab05da11f0ebc3656a6d0
Author: Mai Lavelle
Date:   Wed Nov 29 20:36:53 2017 -0500
Branches: split-kernel-faster-building
https://developer.blender.org/rB1a613e5796ab2edfc40ab05da11f0ebc3656a6d0

Cycles: Fix rendering of barbershop scene

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

M	intern/cycles/kernel/kernel_shader.h

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

diff --git a/intern/cycles/kernel/kernel_shader.h b/intern/cycles/kernel/kernel_shader.h
index eb2d87bd358..d8cb6237e27 100644
--- a/intern/cycles/kernel/kernel_shader.h
+++ b/intern/cycles/kernel/kernel_shader.h
@@ -977,12 +977,17 @@ ccl_device float3 shader_holdout_eval(KernelGlobals *kg, ShaderData *sd)
 ccl_device void shader_eval(KernelGlobals *kg, ShaderData *sd,
 	ccl_addr_space PathState *state, ShaderEvalIntent intent)
 {
+	if(intent == SHADER_EVAL_INTENT_SKIP) {
+		return;
+	}
+
 	uint path_flag = 0;
 	sd->num_closure = 0;
 	sd->num_closure_left = 0;
 
 	switch(intent) {
 		case SHADER_EVAL_INTENT_SKIP:
+			kernel_assert(0);
 			return;
 		case SHADER_EVAL_INTENT_SURFACE:
 			path_flag = state->flag;
@@ -1005,6 +1010,7 @@ ccl_device void shader_eval(KernelGlobals *kg, ShaderData *sd,
 			intent = SHADER_EVAL_INTENT_SURFACE;
 			break;
 		default:
+			kernel_assert(0);
 			return;
 	}