[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29108] branches/render25/source/blender/ render/intern/source/rayshade.c: Render Branch: fix crash cancelling render while building object instance

[Brecht Van Lommel]

Revision: 29108
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29108
Author:   blendix
Date:     2010-05-31 18:25:20 +0200 (Mon, 31 May 2010)

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

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

Modified: branches/render25/source/blender/render/intern/source/rayshade.c
===================================================================
--- branches/render25/source/blender/render/intern/source/rayshade.c	2010-05-31 12:45:45 UTC (rev 29107)
+++ branches/render25/source/blender/render/intern/source/rayshade.c	2010-05-31 16:25:20 UTC (rev 29108)
@@ -427,6 +427,10 @@
 		if(has_special_rayobject(re, obi))
 		{
 			RayObject *obj = raytree_create_object(re, obi);
+
+			if(test_break(re))
+				break;
+
 			RE_rayobject_add( re->db.raytree, obj );
 		}
 		else