[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57017] trunk/blender/intern/cycles/kernel /svm/svm_wireframe.h: Cycles / Wireframe node:

[Thomas Dinges]

Revision: 57017
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57017
Author:   dingto
Date:     2013-05-25 13:34:21 +0000 (Sat, 25 May 2013)
Log Message:
-----------
Cycles / Wireframe node:
* Make sure we have valid geometry data, fixes a crash with Lamp objects.

Reported by lichtwerk in IRC, thanks!

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

Modified: trunk/blender/intern/cycles/kernel/svm/svm_wireframe.h
===================================================================
--- trunk/blender/intern/cycles/kernel/svm/svm_wireframe.h      2013-05-25 
12:42:11 UTC (rev 57016)
+++ trunk/blender/intern/cycles/kernel/svm/svm_wireframe.h      2013-05-25 
13:34:21 UTC (rev 57017)
@@ -45,9 +45,9 @@
 
        /* Calculate wireframe */
 #ifdef __HAIR__
-       if (sd->segment == ~0) {
+       if (sd->prim != ~0 && sd->segment == ~0) {
 #else
-       {
+       if (sd->prim != ~0) {
 #endif
                float3 Co[3];
                float pixelwidth = 1.0f;

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