Fix object motion blur crash with lamp sampling(?), missed a check.

Motion blur documentation is here: http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.65/Cycles#Motion_Blur
2012-10-16 13:20:57 +00:00
parent 9be4c94204
commit 7680f88f18
2 changed files with 13 additions and 7 deletions
--- a/intern/cycles/kernel/kernel_object.h
+++ b/intern/cycles/kernel/kernel_object.h
@@ -134,6 +134,9 @@ __device_inline void object_dir_transform(KernelGlobals *kg, ShaderData *sd, flo

 __device_inline float3 object_location(KernelGlobals *kg, ShaderData *sd)
 {
+	if(sd->object == ~0)
+		return make_float3(0.0f, 0.0f, 0.0f);
+
 #ifdef __OBJECT_MOTION__
 	return make_float3(sd->ob_tfm.x.w, sd->ob_tfm.y.w, sd->ob_tfm.z.w);
 #else