From 9bf7a2a8c49d07bf41b5b2f743075ccf45cc9e02 Mon Sep 17 00:00:00 2001
From: Thomas Dinges <blender@dingto.org>
Date: Sat, 25 May 2013 13:34:21 +0000
Subject: Cycles / Wireframe node: * Make sure we have valid geometry data,
 fixes a crash with Lamp objects.

Reported by lichtwerk in IRC, thanks!
---
 intern/cycles/kernel/svm/svm_wireframe.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'intern')

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;
-- 
cgit v1.2.3