[Bf-blender-cvs] [ca1c7a0] master: Fix T49422: Metadata not showing in OpenGL renders
Sergey Sharybin
noreply at git.blender.org
Thu Sep 22 09:42:42 CEST 2016
Commit: ca1c7a0cf7a27d513e7f44b8f0e9a967a9dba2d2
Author: Sergey Sharybin
Date: Thu Sep 22 09:42:09 2016 +0200
Branches: master
https://developer.blender.org/rBca1c7a0cf7a27d513e7f44b8f0e9a967a9dba2d2
Fix T49422: Metadata not showing in OpenGL renders
Own regression since recent optimization.
===================================================================
M source/blender/editors/render/render_opengl.c
===================================================================
diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c
index a154791..db0ffb9 100644
--- a/source/blender/editors/render/render_opengl.c
+++ b/source/blender/editors/render/render_opengl.c
@@ -373,12 +373,10 @@ static void screen_opengl_render_doit(OGLRender *oglrender, RenderResult *rr)
}
if (ibuf_result != NULL) {
-
- RE_render_result_rect_from_ibuf(rr, &scene->r, ibuf_result, oglrender->view_id);
-
- if ((scene->r.stamp & R_STAMP_ALL) && (scene->r.stamp & R_STAMP_DRAW))
+ if ((scene->r.stamp & R_STAMP_ALL) && (scene->r.stamp & R_STAMP_DRAW)) {
BKE_image_stamp_buf(scene, camera, NULL, rect, NULL, rr->rectx, rr->recty, 4);
-
+ }
+ RE_render_result_rect_from_ibuf(rr, &scene->r, ibuf_result, oglrender->view_id);
IMB_freeImBuf(ibuf_result);
}
}
More information about the Bf-blender-cvs
mailing list