[Bf-blender-cvs] [9939ec0] master: Fix T37994: crash in preview render after recent color management changes.
Lawrence D'Oliveiro
noreply at git.blender.org
Tue Dec 31 15:03:37 CET 2013
Commit: 9939ec06dd590fa520ab4138e011b0738a2639ea
Author: Lawrence D'Oliveiro
Date: Tue Dec 31 15:00:00 2013 +0100
https://developer.blender.org/rB9939ec06dd590fa520ab4138e011b0738a2639ea
Fix T37994: crash in preview render after recent color management changes.
Reviewed By: brecht
===================================================================
M source/blender/render/intern/source/pipeline.c
===================================================================
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index db12dd1..6e2d55b 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -1038,10 +1038,16 @@ static void threaded_tile_processor(Render *re)
thread[a].workqueue = workqueue;
thread[a].donequeue = donequeue;
thread[a].number = a;
+
if (render_display_update_enabled(re)) {
thread[a].display_update = re->display_update;
thread[a].duh = re->duh;
}
+ else {
+ thread[a].display_update = NULL;
+ thread[a].duh = NULL;
+ }
+
BLI_insert_thread(&threads, &thread[a]);
}
More information about the Bf-blender-cvs
mailing list