blender
/
blender
134
398
Fork 580
Code Issues 6.3k Pull Requests 758 Projects 19 Wiki Activity

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.
This commit is contained in:
Sergey Sharybin 2016-10-10 15:52:10 +02:00
parent f36543c5f5
commit cf449d377b
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/editors/render/render_opengl.c
View File

@ -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: