diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-11 12:20:31 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-11 16:26:06 +0300 |
| commit | 56a633fd2c404ade7c97a5d4579183c28a969c0b (patch) | |
| tree | 33c44d0384065897e1e298c876c610ef7f4be7de /intern/cycles/kernel/kernel_shader.h | |
| parent | 6503b4f90f3336b22eff0bd0b61f86fd2cfd531b (diff) | |
Fix T61103: Cycles bevel wrong on objects with negative scale.
Diffstat (limited to 'intern/cycles/kernel/kernel_shader.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_shader.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/kernel/kernel_shader.h b/intern/cycles/kernel/kernel_shader.h index d573270fd76..afb9ff11c10 100644 --- a/intern/cycles/kernel/kernel_shader.h +++ b/intern/cycles/kernel/kernel_shader.h @@ -56,7 +56,7 @@ ccl_device_noinline void shader_setup_from_ray(KernelGlobals *kg, PROFILING_INIT(kg, PROFILING_SHADER_SETUP); #ifdef __INSTANCING__ - sd->object = (isect->object == PRIM_NONE)? kernel_tex_fetch(__prim_object, isect->prim): isect->object; + sd->object = (isect->object == OBJECT_NONE)? kernel_tex_fetch(__prim_object, isect->prim): isect->object; #endif sd->lamp = LAMP_NONE; @@ -411,7 +411,7 @@ ccl_device_inline void shader_setup_from_background(KernelGlobals *kg, ShaderDat sd->ray_length = 0.0f; #ifdef __INSTANCING__ - sd->object = PRIM_NONE; + sd->object = OBJECT_NONE; #endif sd->lamp = LAMP_NONE; sd->prim = PRIM_NONE; @@ -457,7 +457,7 @@ ccl_device_inline void shader_setup_from_volume(KernelGlobals *kg, ShaderData *s sd->ray_length = 0.0f; /* todo: can we set this to some useful value? */ # ifdef __INSTANCING__ - sd->object = PRIM_NONE; /* todo: fill this for texture coordinates */ + sd->object = OBJECT_NONE; /* todo: fill this for texture coordinates */ # endif sd->lamp = LAMP_NONE; sd->prim = PRIM_NONE; |