diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-02-15 19:09:49 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-02-15 19:09:49 +0300 |
| commit | 13d31b16044f4230ba57c0896ee3cdcb739c7f26 (patch) | |
| tree | 502863be17b71d1719a3ed646f61bfd7ccb66da0 | |
| parent | 3e628eefa9f55fac7b0faaec4fd4392c2de6b20e (diff) | |
Fix T50542: Wrong metadata frame when using OpenGL render
| -rw-r--r-- | source/blender/editors/render/render_opengl.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c index 9097432a251..55c07140216 100644 --- a/source/blender/editors/render/render_opengl.c +++ b/source/blender/editors/render/render_opengl.c @@ -887,13 +887,13 @@ static void write_result_func(TaskPool * __restrict pool, ReportList reports; BKE_reports_init(&reports, oglrender->reports->flag & ~RPT_PRINT); /* Do actual save logic here, depending on the file format. */ + Scene tmp_scene = *scene; + tmp_scene.r.cfra = cfra; if (is_movie) { /* We have to construct temporary scene with proper scene->r.cfra. * This is because underlying calls do not use r.cfra but use scene * for that. */ - Scene tmp_scene = *scene; - tmp_scene.r.cfra = cfra; ok = RE_WriteRenderViewsMovie(&reports, rr, &tmp_scene, @@ -917,8 +917,8 @@ static void write_result_func(TaskPool * __restrict pool, true, NULL); - BKE_render_result_stamp_info(scene, scene->camera, rr, false); - ok = RE_WriteRenderViewsImage(NULL, rr, scene, true, name); + BKE_render_result_stamp_info(&tmp_scene, tmp_scene.camera, rr, false); + ok = RE_WriteRenderViewsImage(NULL, rr, &tmp_scene, true, name); if (!ok) { BKE_reportf(&reports, RPT_ERROR, |