[Bf-blender-cvs] [8e7ec36] master: Fix T38969: RenderResult in RenderPart can be NULL if multithreaded renders are cancelled early.

Lukas Tönne noreply at git.blender.org
Wed Mar 5 17:49:42 CET 2014


Commit: 8e7ec3652e94f75d6ffe134dcac7fc4cc5c66f89
Author: Lukas Tönne
Date:   Wed Mar 5 17:42:48 2014 +0100
https://developer.blender.org/rB8e7ec3652e94f75d6ffe134dcac7fc4cc5c66f89

Fix T38969: RenderResult in RenderPart can be NULL if multithreaded
renders are cancelled early.

===================================================================

M	source/blender/editors/render/render_internal.c

===================================================================

diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c
index a842135..35f17ec 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;
 	}




More information about the Bf-blender-cvs mailing list