diff options
| author | Mai Lavelle <mai.lavelle@gmail.com> | 2017-11-30 04:36:53 +0300 |
|---|---|---|
| committer | Mai Lavelle <mai.lavelle@gmail.com> | 2017-11-30 04:36:53 +0300 |
| commit | 1a613e5796ab2edfc40ab05da11f0ebc3656a6d0 (patch) | |
| tree | c63b0b8f0615c512f1cb6436cfdbe6e69d507f39 | |
| parent | 137fd5ffcba7f049e50200114da8e231cc136189 (diff) | |
Cycles: Fix rendering of barbershop scenesplit-kernel-faster-building
| -rw-r--r-- | intern/cycles/kernel/kernel_shader.h | 6 |
1 files changed, 6 insertions, 0 deletions
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; } |