[Bf-blender-cvs] [242246e] master: Fix T46605: Compositing causes access violation when rendering from command line

[Sergey Sharybin]

Commit: 242246e9fc954f66ff78161572948da6689298be
Author: Sergey Sharybin
Date:   Tue Oct 27 21:03:22 2015 +0500
Branches: master
https://developer.blender.org/rB242246e9fc954f66ff78161572948da6689298be

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.

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

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 811209f..eb0b331 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