From 8e7ec3652e94f75d6ffe134dcac7fc4cc5c66f89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20T=C3=B6nne?= Date: Wed, 5 Mar 2014 17:42:48 +0100 Subject: Fix T38969: RenderResult in RenderPart can be NULL if multithreaded renders are cancelled early. --- source/blender/editors/render/render_internal.c | 7 +++++-- 1 file 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; } -- cgit v1.2.3