[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46206] trunk/blender/intern/cycles/kernel /kernel_shader.h: Fix #31247: cycles crash after recent bugfix.

[Brecht Van Lommel]

Revision: 46206
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46206
Author:   blendix
Date:     2012-05-02 18:14:59 +0000 (Wed, 02 May 2012)
Log Message:
-----------
Fix #31247: cycles crash after recent bugfix.

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	2012-05-02 18:11:09 UTC (rev 46205)
+++ trunk/blender/intern/cycles/kernel/kernel_shader.h	2012-05-02 18:14:59 UTC (rev 46206)
@@ -180,7 +180,8 @@
 	}
 
 	sd->flag = kernel_tex_fetch(__shader_flag, (sd->shader & SHADER_MASK)*2);
-	sd->flag |= kernel_tex_fetch(__object_flag, sd->object);
+	if(sd->object != -1)
+		sd->flag |= kernel_tex_fetch(__object_flag, sd->object);
 
 #ifdef __DPDU__
 	/* dPdu/dPdv */