diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-12-16 00:43:25 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-12-16 00:43:25 +0400 |
| commit | caf2324d56da9ce69de7a37dfb3aa91e55de2ebb (patch) | |
| tree | 2efa7a3cddb6679b6325b5ce9fdf75608fb4324a /intern/cycles/kernel/kernel_shader.h | |
| parent | 0ac1424264248a260ffc77a1b0febe1ee46331fe (diff) | |
Fix cycles build error with OSL disabled.
Diffstat (limited to 'intern/cycles/kernel/kernel_shader.h')
| -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; |