diff options
author | Campbell Barton <ideasman42@gmail.com> | 2007-12-24 20:07:52 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2007-12-24 20:07:52 +0300 |
commit | 052a0551e49da2a1b07a42c3e67579d9ead4c1fe (patch) | |
tree | 0a06ed4edda3967364d8a00af33ce5c67357a191 /source/blender/src/renderwin.c | |
parent | 8a07e665c28a94ffd188daa431a4fd0c5a460eba (diff) |
Added 'File->External Data->Make all files Absolute'
OpenGL stamp also wasnt checking correctly (own error)
Diffstat (limited to 'source/blender/src/renderwin.c')
-rw-r--r-- | source/blender/src/renderwin.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/src/renderwin.c b/source/blender/src/renderwin.c index 8250ba4902d..e97fdef27ff 100644 --- a/source/blender/src/renderwin.c +++ b/source/blender/src/renderwin.c @@ -1300,7 +1300,9 @@ void BIF_do_ogl_render(View3D *v3d, int anim) do_ogl_view3d_render(re, 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); + if((G.scene->r.scemode & R_STAMP_INFO) && (G.scene->r.stamp & R_STAMP_DRAW)) { + 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)) { @@ -1340,7 +1342,9 @@ void BIF_do_ogl_render(View3D *v3d, int anim) else { do_ogl_view3d_render(re, 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); + if((G.scene->r.scemode & R_STAMP_INFO) && (G.scene->r.stamp & R_STAMP_DRAW)) { + BKE_stamp_buf((unsigned char *)rr->rect32, rr->rectf, rr->rectx, rr->recty); + } window_swap_buffers(render_win->win); } |