diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-08-10 18:26:51 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-08-10 18:26:51 +0400 |
| commit | b98ccf699878d70b7cbfdd7863440c34326a5569 (patch) | |
| tree | 7dde3d3deddedb5d54f2a45ffbb517f2999a83dc /intern/cycles/kernel/kernel_shader.h | |
| parent | abc601d10ee51aa8de83004094e2e6c73e96e2eb (diff) | |
Cycles: amd opencl compatibility fixes.
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 f1abbda7ae5..c4fc65596b2 100644 --- a/intern/cycles/kernel/kernel_shader.h +++ b/intern/cycles/kernel/kernel_shader.h @@ -140,14 +140,18 @@ __device void shader_setup_from_sample(KernelGlobals *kg, ShaderData *sd, #endif /* detect instancing, for non-instanced the object index is -object-1 */ +#ifdef __INSTANCING__ bool instanced = false; if(sd->prim != ~0) { if(sd->object >= 0) instanced = true; else +#endif sd->object = -sd->object-1; +#ifdef __INSTANCING__ } +#endif /* smooth normal */ if(sd->shader < 0) { |