diff options
author | Brecht Van Lommel <brecht@blender.org> | 2021-01-15 19:21:14 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2021-01-15 19:29:36 +0300 |
commit | 3732508c64ad51c77a6fb83a2444af104d95cfd9 (patch) | |
tree | e9d31126cb4c3cf6a1e7e9601ce2ba93e5282fcc /source/blender/blenlib/BLI_task.h | |
parent | 340529a8453ca9c2715c545245379e442f6006c8 (diff) |
Fix T84745: build error with TBB 2021
task_group::is_canceling() was removed.
Diffstat (limited to 'source/blender/blenlib/BLI_task.h')
-rw-r--r-- | source/blender/blenlib/BLI_task.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/blenlib/BLI_task.h b/source/blender/blenlib/BLI_task.h index a3805f71316..9e61686b37a 100644 --- a/source/blender/blenlib/BLI_task.h +++ b/source/blender/blenlib/BLI_task.h @@ -105,8 +105,10 @@ void BLI_task_pool_work_and_wait(TaskPool *pool); /* cancel all tasks, keep worker threads running */ void BLI_task_pool_cancel(TaskPool *pool); -/* for worker threads, test if canceled */ -bool BLI_task_pool_canceled(TaskPool *pool); +/* for worker threads, test if current task pool canceled. this function may + * only be called from worker threads and pool must be the task pool that the + * thread is currently executing a task from. */ +bool BLI_task_pool_current_canceled(TaskPool *pool); /* optional userdata pointer to pass along to run function */ void *BLI_task_pool_user_data(TaskPool *pool); |