Fix #29278: cycles crash with displacement method both.

2011-11-15 22:09:30 +00:00
parent bff59a5b2e
commit 63ff37c6d4
1 changed files with 1 additions and 2 deletions
--- 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 */