Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-09-22 10:42:09 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-09-22 10:42:09 +0300
commitca1c7a0cf7a27d513e7f44b8f0e9a967a9dba2d2 (patch)
tree86b900d43c920b3b05c0244fb2ecae71adc6b241
parent6f806045093419a55b16c596dd8690ea0bbae138 (diff)
Fix T49422: Metadata not showing in OpenGL renders
Own regression since recent optimization.
-rw-r--r--source/blender/editors/render/render_opengl.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c
index a154791f8f7..db0ffb90344 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);
}
}