diff options
author | Antony Riakiotakis <kalast@gmail.com> | 2015-05-06 15:46:45 +0300 |
---|---|---|
committer | Antony Riakiotakis <kalast@gmail.com> | 2015-05-06 15:47:01 +0300 |
commit | aaa6b39bfeb315a017e0d69f9780e894d4154e76 (patch) | |
tree | 7e70a5be2330a6633237ed451085fc2131675ffc /source/blender | |
parent | 15751238d5d9cf7868c131f09b224f5c41b518f3 (diff) |
Quick patch-up for opengl render metadata.
Camera here is incorrect for multiview (as is in real multiview render)
but at least it works now.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/render/render_opengl.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c index 7fbdf9dc66b..3f3bdaa59d0 100644 --- a/source/blender/editors/render/render_opengl.c +++ b/source/blender/editors/render/render_opengl.c @@ -146,6 +146,7 @@ static void screen_opengl_views_setup(OGLRender *oglrender) RenderView *rv; SceneRenderView *srv; bool is_multiview; + Object *camera; View3D *v3d = oglrender->v3d; RenderData *rd = &oglrender->scene->r; @@ -236,6 +237,10 @@ static void screen_opengl_views_setup(OGLRender *oglrender) } BLI_unlock_thread(LOCK_DRAW_IMAGE); + /* will only work for non multiview correctly */ + camera = BKE_camera_multiview_render(oglrender->scene, v3d->camera, "new opengl render view"); + BKE_render_result_stamp_info(oglrender->scene, camera, rr); + RE_ReleaseResult(oglrender->re); } @@ -474,12 +479,9 @@ static void screen_opengl_render_write(OGLRender *oglrender) RenderResult *rr; bool ok; char name[FILE_MAX]; - Object *camera = RE_GetCamera(oglrender->re); rr = RE_AcquireResultRead(oglrender->re); - BKE_render_result_stamp_info(scene, camera, rr); - BKE_image_path_from_imformat( name, scene->r.pic, oglrender->bmain->name, scene->r.cfra, &scene->r.im_format, (scene->r.scemode & R_EXTENSION) != 0, false, NULL); |