diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-04-04 16:47:58 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-04-04 16:47:58 +0300 |
| commit | 7fc84d4e32e9188cd3c4b7b732f700a632099001 (patch) | |
| tree | ebcaad453138c11c64d4dd0d7bf7c058327e6ca9 /source/blender/blenlib | |
| parent | c8cff31922a1e1138929b8ccfdab744b106f8b09 (diff) | |
| parent | 92aeb84fde6402c0d2e337b030c06cfd171f5ba1 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenlib')
| -rw-r--r-- | source/blender/blenlib/intern/task.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/source/blender/blenlib/intern/task.c b/source/blender/blenlib/intern/task.c index 17e20f8fa18..297d0f0b310 100644 --- a/source/blender/blenlib/intern/task.c +++ b/source/blender/blenlib/intern/task.c @@ -743,9 +743,7 @@ void BLI_task_pool_work_and_wait(TaskPool *pool) BLI_condition_notify_all(&scheduler->queue_cond); BLI_mutex_unlock(&scheduler->queue_mutex); - } - pool->is_suspended = false; } pool->do_work = true; |