diff options
| author | Thomas Dinges <blender@dingto.org> | 2013-05-25 17:34:21 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2013-05-25 17:34:21 +0400 |
| commit | 9bf7a2a8c49d07bf41b5b2f743075ccf45cc9e02 (patch) | |
| tree | f43eb9cf3003ef1d9bfbf75b7ad6c506c9df759d /intern | |
| parent | 092d9c31a14d44ea440fcab657e61827ace14875 (diff) | |
Cycles / Wireframe node:
* Make sure we have valid geometry data, fixes a crash with Lamp objects.
Reported by lichtwerk in IRC, thanks!
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/kernel/svm/svm_wireframe.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/svm/svm_wireframe.h b/intern/cycles/kernel/svm/svm_wireframe.h index efe09051403..9ecb81847d7 100644 --- a/intern/cycles/kernel/svm/svm_wireframe.h +++ b/intern/cycles/kernel/svm/svm_wireframe.h @@ -45,9 +45,9 @@ __device void svm_node_wireframe(KernelGlobals *kg, ShaderData *sd, float *stack /* 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; |