Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLawrence D'Oliveiro <from-blender@geek-central.gen.nz>2013-12-31 18:00:00 +0400
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2013-12-31 18:03:06 +0400
commit9939ec06dd590fa520ab4138e011b0738a2639ea (patch)
tree026e7a9746226e321eeeab0c3a1bf5860426fac0 /source/blender/render
parent1fa63b317a032fc348dab1ca69a8358f0fb3ae02 (diff)
Fix T37994: crash in preview render after recent color management changes.
Reviewed By: brecht
Diffstat (limited to 'source/blender/render')
-rw-r--r--source/blender/render/intern/source/pipeline.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index db12dd1d703..6e2d55be952 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]);
}