From 887e5cb7b001598d0859b8066b807df2fb3b5068 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Tue, 27 Oct 2015 21:03:22 +0500 Subject: Fix T46605: Compositing causes access violation when rendering from command line Seems was caused by the race condition in the stats printing, should be all fine now. Nice for 'a' release. --- source/blender/render/intern/source/pipeline.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'source/blender') diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 150a04238eb..64e6c146e53 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -2108,9 +2108,10 @@ static void ntree_render_scenes(Render *re) /* bad call... need to think over proper method still */ static void render_composit_stats(void *UNUSED(arg), const char *str) { - R.i.infostr = str; - R.stats_draw(R.sdh, &R.i); - R.i.infostr = NULL; + RenderStats i; + memcpy(&i, &R.i, sizeof(i)); + i.infostr = str; + R.stats_draw(R.sdh, &i); } #ifdef WITH_FREESTYLE -- cgit v1.2.3