diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-06-22 19:04:03 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-06-22 19:04:03 +0400 |
| commit | c0be8ee8cb1bf2f0a92e9475415ae00d1a645cbe (patch) | |
| tree | 0731800d3884c2d615184bcb79c2d7948deea155 /source/blender/render | |
| parent | 50a8d1803b558c04abc23e882464faa45befcef0 (diff) | |
Fix crash cancelling render while building object instance in
raytree, object could still be added after it was already freed.
(merge from render25 branch)
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/rayshade.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/render/intern/source/rayshade.c b/source/blender/render/intern/source/rayshade.c index b184b681846..bd6e804f13b 100644 --- a/source/blender/render/intern/source/rayshade.c +++ b/source/blender/render/intern/source/rayshade.c @@ -370,6 +370,10 @@ static void makeraytree_single(Render *re) if(has_special_rayobject(re, obi)) { RayObject *obj = makeraytree_object(re, obi); + + if(test_break(re)) + break; + RE_rayobject_add( re->raytree, obj ); } else |