From cfb7aee017d95137e19b7b006d9393b5d6a935d4 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 7 Jul 2012 22:51:57 +0000 Subject: style cleanup --- source/blender/editors/render/render_opengl.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to '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 d37a16cb1bb..538b4b3884a 100644 --- a/source/blender/editors/render/render_opengl.c +++ b/source/blender/editors/render/render_opengl.c @@ -477,11 +477,9 @@ static int screen_opengl_render_anim_step(bContext *C, wmOperator *op) const short view_context = (oglrender->v3d != NULL); Object *camera = NULL; - /* update animated image textures for gpu, etc, - * call before BKE_scene_update_for_newframe so modifiers with textures don't lag 1 frame */ - ED_image_update_frame(bmain, scene->r.cfra); - /* go to next frame */ + if (CFRA < oglrender->nfra) + CFRA++; while (CFRA < oglrender->nfra) { unsigned int lay = screen_opengl_layers(oglrender); @@ -492,6 +490,10 @@ static int screen_opengl_render_anim_step(bContext *C, wmOperator *op) CFRA++; } + /* update animated image textures for gpu, etc, + * call before BKE_scene_update_for_newframe so modifiers with textures don't lag 1 frame */ + ED_image_update_frame(bmain, CFRA); + BKE_scene_update_for_newframe(bmain, scene, screen_opengl_layers(oglrender)); if (view_context) { @@ -569,10 +571,9 @@ static int screen_opengl_render_anim_step(bContext *C, wmOperator *op) /* go to next frame */ oglrender->nfra += scene->r.frame_step; - scene->r.cfra++; /* stop at the end or on error */ - if (scene->r.cfra > PEFRA || !ok) { + if (CFRA >= PEFRA || !ok) { screen_opengl_render_end(C, op->customdata); return 0; } -- cgit v1.2.3