Commit: 887e5cb7b001598d0859b8066b807df2fb3b5068
Author: Sergey Sharybin
Date: Tue Oct 27 21:03:22 2015 +0500
Branches: blender-v2.76-release
https://developer.blender.org/rB887e5cb7b001598d0859b8066b807df2fb3b5068
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 150a042..64e6c14 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
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
