[Bf-blender-cvs] [cf449d3] master: OpenGL animation: Fix stupid mistake form previous commit

Sergey Sharybin noreply at git.blender.org
Mon Oct 10 15:52:58 CEST 2016


Commit: cf449d377b567f702a54a6160bb0f0050401f0d9
Author: Sergey Sharybin
Date:   Mon Oct 10 15:52:10 2016 +0200
Branches: master
https://developer.blender.org/rBcf449d377b567f702a54a6160bb0f0050401f0d9

OpenGL animation: Fix stupid mistake form previous commit

Flagging of pool to cancel was done in the wrong place, making last
frames missing in the final video.

===================================================================

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 d9edff4..6f3694d 100644
--- a/source/blender/editors/render/render_opengl.c
+++ b/source/blender/editors/render/render_opengl.c
@@ -737,8 +737,6 @@ static void screen_opengl_render_end(bContext *C, OGLRender *oglrender)
 	int i;
 
 	if (oglrender->is_animation) {
-		/* Flag pool for cancel. */
-		oglrender->pool_ok = false;
 		BLI_task_pool_work_and_wait(oglrender->task_pool);
 		BLI_task_pool_free(oglrender->task_pool);
 		BLI_task_scheduler_free(oglrender->task_scheduler);
@@ -1053,6 +1051,7 @@ static int screen_opengl_render_modal(bContext *C, wmOperator *op, const wmEvent
 	switch (event->type) {
 		case ESCKEY:
 			/* cancel */
+			oglrender->pool_ok = false;  /* Flag pool for cancel. */
 			screen_opengl_render_end(C, op->customdata);
 			return OPERATOR_FINISHED;
 		case TIMER:




More information about the Bf-blender-cvs mailing list