blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

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.
This commit is contained in:
Antonis Ryakiotakis 2015-05-06 14:46:45 +02:00
parent 15751238d5
commit aaa6b39bfe
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/render/render_opengl.c
View File

@ -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);