diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-12-31 17:07:06 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-12-31 17:07:06 +0400 |
| commit | 97c6a55c39e1a1949e04cf491946f8b275e2efb5 (patch) | |
| tree | 1e682efccfc897cfe8a5a83c7a5bd97eebcca45e /intern | |
| parent | fc6784126bf06dad15a9a84fcb15773f9caa70c8 (diff) | |
Fix #33706: issue in cycles motion blur rendering after hair commit, my fault
for not finding it in review.
Also removed the hard limits on motion blur shutter time, soft limits are still
the same but it can be useful to set things lower/higher in some cases.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/kernel/kernel_shader.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/intern/cycles/kernel/kernel_shader.h b/intern/cycles/kernel/kernel_shader.h index 36cd21c1b48..652efa18b93 100644 --- a/intern/cycles/kernel/kernel_shader.h +++ b/intern/cycles/kernel/kernel_shader.h @@ -60,6 +60,8 @@ __device_inline void shader_setup_from_ray(KernelGlobals *kg, ShaderData *sd, sd->object = (isect->object == ~0)? kernel_tex_fetch(__prim_object, isect->prim): isect->object; #endif + sd->flag = kernel_tex_fetch(__object_flag, sd->object); + /* matrices and time */ #ifdef __OBJECT_MOTION__ shader_setup_object_transforms(kg, sd, ray->time); @@ -121,8 +123,7 @@ __device_inline void shader_setup_from_ray(KernelGlobals *kg, ShaderData *sd, sd->I = -ray->D; - sd->flag = kernel_tex_fetch(__shader_flag, (sd->shader & SHADER_MASK)*2); - sd->flag |= kernel_tex_fetch(__object_flag, sd->object); + sd->flag |= kernel_tex_fetch(__shader_flag, (sd->shader & SHADER_MASK)*2); #ifdef __INSTANCING__ if(isect->object != ~0) { |