diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-16 02:09:30 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-16 02:09:30 +0400 |
commit | 63ff37c6d4b081f06c4319326057df3104213504 (patch) | |
tree | d3d33efe737a4743955d5fa5937ae89a5a88a368 /intern/cycles/kernel/kernel_shader.h | |
parent | bff59a5b2eb9f8fd50df6250f020b46ff71bcdba (diff) |
Fix #29278: cycles crash with displacement method both.
Diffstat (limited to 'intern/cycles/kernel/kernel_shader.h')
-rw-r--r-- | intern/cycles/kernel/kernel_shader.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/intern/cycles/kernel/kernel_shader.h b/intern/cycles/kernel/kernel_shader.h index ac0df71c38f..1647504207a 100644 --- a/intern/cycles/kernel/kernel_shader.h +++ b/intern/cycles/kernel/kernel_shader.h @@ -226,8 +226,7 @@ __device void shader_setup_from_displace(KernelGlobals *kg, ShaderData *sd, Ng = triangle_normal_MT(kg, prim, &shader); /* force smooth shading for displacement */ - if(shader >= 0) - shader = -shader; + sd->shader |= SHADER_SMOOTH_NORMAL; /* watch out: no instance transform currently */ |