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:
authorCampbell Barton <ideasman42@gmail.com>2007-12-01 22:19:49 +0300
committerCampbell Barton <ideasman42@gmail.com>2007-12-01 22:19:49 +0300
commitf06872d493dec309c963908e0079b454f4e38110 (patch)
tree669b011bcc620fe322d1cb49ec48331588eb26fb /source/blender/src/renderwin.c
parent4ba215478f9e1d31b13ae24c4886dabc7c2d8eb1 (diff)
mesh_edges2curves.py - fix for duplicate points
renderwin.c - stamp info in openGL render
Diffstat (limited to 'source/blender/src/renderwin.c')
-rw-r--r--source/blender/src/renderwin.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/src/renderwin.c b/source/blender/src/renderwin.c
index 2d56b78b026..4de80414d46 100644
--- a/source/blender/src/renderwin.c
+++ b/source/blender/src/renderwin.c
@@ -1284,6 +1284,7 @@ void BIF_do_ogl_render(View3D *v3d, int anim)
break;
drawview3d_render(v3d, winx, winy);
glReadPixels(0, 0, winx, winy, GL_RGBA, GL_UNSIGNED_BYTE, rr->rect32);
+ BKE_stamp_buf((unsigned char *)rr->rect32, rr->rectf, rr->rectx, rr->recty);
window_swap_buffers(render_win->win);
if(BKE_imtype_is_movie(G.scene->r.imtype)) {
@@ -1297,7 +1298,7 @@ void BIF_do_ogl_render(View3D *v3d, int anim)
BKE_makepicstring(name, G.scene->r.pic, G.scene->r.cfra, G.scene->r.imtype);
- ibuf->rect= (unsigned int *)rr->rect32;
+ ibuf->rect= (unsigned int *)rr->rect32;
ok= BKE_write_ibuf(ibuf, name, G.scene->r.imtype, G.scene->r.subimtype, G.scene->r.quality);
if(ok==0) {
@@ -1323,6 +1324,7 @@ void BIF_do_ogl_render(View3D *v3d, int anim)
else {
drawview3d_render(v3d, winx, winy);
glReadPixels(0, 0, winx, winy, GL_RGBA, GL_UNSIGNED_BYTE, rr->rect32);
+ BKE_stamp_buf((unsigned char *)rr->rect32, rr->rectf, rr->rectx, rr->recty);
window_swap_buffers(render_win->win);
}