diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-10-27 19:03:22 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-10-29 13:10:16 +0300 |
| commit | 887e5cb7b001598d0859b8066b807df2fb3b5068 (patch) | |
| tree | 9a9edfb2b624826f394a706ba8a3ccbcdfcca8d9 /source/blender | |
| parent | 4eb34dbc8884259e0660c825507b3460f768a4f8 (diff) | |
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.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/render/intern/source/pipeline.c | 7 |
1 files changed, 4 insertions, 3 deletions
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 |