diff options
| -rw-r--r-- | intern/cycles/kernel/kernel_shader.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/intern/cycles/kernel/kernel_shader.h b/intern/cycles/kernel/kernel_shader.h index 9bbfe6b0cc5..47b4d02e5bf 100644 --- a/intern/cycles/kernel/kernel_shader.h +++ b/intern/cycles/kernel/kernel_shader.h @@ -752,7 +752,11 @@ __device void shader_merge_closures(KernelGlobals *kg, ShaderData *sd) for(int j = i + 1; j < sd->num_closure; j++) { ShaderClosure *scj = &sd->closure[j]; +#ifdef __OSL__ if(!sci->prim && sci->type == scj->type && sci->data0 == scj->data0 && sci->data1 == scj->data1) { +#else + if(sci->type == scj->type && sci->data0 == scj->data0 && sci->data1 == scj->data1) { +#endif sci->weight += scj->weight; sci->sample_weight += scj->sample_weight; |