diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-10-10 16:52:10 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-10-10 16:52:10 +0300 |
| commit | cf449d377b567f702a54a6160bb0f0050401f0d9 (patch) | |
| tree | 3adda91ddb14dfd30c8bc81701dfebda6abd0181 | |
| parent | f36543c5f552eae909e9afd72bef9773138c192a (diff) | |
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.
| -rw-r--r-- | source/blender/editors/render/render_opengl.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c index d9edff4a706..6f3694d1db8 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: |