[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29617] trunk/blender/source/blender/ render/intern/source/rayshade.c: Fix crash cancelling render while building object instance in

[Brecht Van Lommel]

Revision: 29617
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29617
Author:   blendix
Date:     2010-06-22 17:04:03 +0200 (Tue, 22 Jun 2010)

Log Message:
-----------
Fix crash cancelling render while building object instance in
raytree, object could still be added after it was already freed.

(merge from render25 branch)

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/rayshade.c

Modified: trunk/blender/source/blender/render/intern/source/rayshade.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/rayshade.c	2010-06-22 15:02:23 UTC (rev 29616)
+++ trunk/blender/source/blender/render/intern/source/rayshade.c	2010-06-22 15:04:03 UTC (rev 29617)
@@ -370,6 +370,10 @@
 		if(has_special_rayobject(re, obi))
 		{
 			RayObject *obj = makeraytree_object(re, obi);
+
+			if(test_break(re))
+				break;
+
 			RE_rayobject_add( re->raytree, obj );
 		}
 		else