[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41897] trunk/blender/intern/cycles/kernel /kernel_shader.h: Fix #29278: cycles crash with displacement method both.

[Brecht Van Lommel]

Revision: 41897
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41897
Author:   blendix
Date:     2011-11-15 22:09:30 +0000 (Tue, 15 Nov 2011)
Log Message:
-----------
Fix #29278: cycles crash with displacement method both.

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/kernel_shader.h

Modified: trunk/blender/intern/cycles/kernel/kernel_shader.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_shader.h  2011-11-15 21:55:07 UTC 
(rev 41896)
+++ trunk/blender/intern/cycles/kernel/kernel_shader.h  2011-11-15 22:09:30 UTC 
(rev 41897)
@@ -226,8 +226,7 @@
        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 */
 

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs