diff options
author | Lukas Tönne <lukas.toenne@gmail.com> | 2014-03-05 20:42:48 +0400 |
---|---|---|
committer | Lukas Tönne <lukas.toenne@gmail.com> | 2014-03-05 20:44:25 +0400 |
commit | 8e7ec3652e94f75d6ffe134dcac7fc4cc5c66f89 (patch) | |
tree | 490cc72abb33477f8d085a863b7c39dc0bd847f4 /source | |
parent | a8dc5b274b5105be96694a9ea1a70871b5a7183f (diff) |
Fix T38969: RenderResult in RenderPart can be NULL if multithreaded
renders are cancelled early.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/render/render_internal.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index a842135ce72..35f17ec22af 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -532,7 +532,10 @@ static void image_rect_update(void *rjv, RenderResult *rr, volatile rcti *renrec *(rj->do_update) = TRUE; return; } - + + if (rr == NULL) + return; + /* update part of render */ render_image_update_pass_and_layer(rj, rr, &rj->iuser); ibuf = BKE_image_acquire_ibuf(ima, &rj->iuser, &lock); @@ -550,7 +553,7 @@ static void image_rect_update(void *rjv, RenderResult *rr, volatile rcti *renrec { image_buffer_rect_update(rj, rr, ibuf, &rj->iuser, renrect); } - + /* make jobs timer to send notifier */ *(rj->do_update) = TRUE; } |