kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

OpenGL render: Fix missing file output after pressing Esc

Browse Source 
Apparently, the whole G.is_break is not used by OpenGL render, meaning
this flag will not be clear before running the operator. This was
causing missing file output after pressing Esc once for the rest of
Blender session.
This commit is contained in:
Sergey Sharybin 2016-10-10 12:51:01 +02:00
parent 109192b360
commit 54dad5c49f
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -737,6 +737,8 @@ 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);
@ -860,7 +862,7 @@ static void write_result_func(TaskPool * __restrict pool,
const int cfra = task_data->cfra;
bool ok;
/* Don't attempt to write if we've got an error. */
if (!oglrender->pool_ok || G.is_break) {
if (!oglrender->pool_ok) {
RE_FreeRenderResult(rr);
BLI_mutex_lock(&oglrender->task_mutex);
oglrender->num_scheduled_frames--;