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/intern/task_pool.cc | |
| parent | 340529a8453ca9c2715c545245379e442f6006c8 (diff) | |
Fix T84745: build error with TBB 2021
task_group::is_canceling() was removed.
Diffstat (limited to 'source/blender/blenlib/intern/task_pool.cc')
| -rw-r--r-- | source/blender/blenlib/intern/task_pool.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenlib/intern/task_pool.cc b/source/blender/blenlib/intern/task_pool.cc index dfed24da2d9..4b545c5647e 100644 --- a/source/blender/blenlib/intern/task_pool.cc +++ b/source/blender/blenlib/intern/task_pool.cc @@ -268,7 +268,7 @@ static bool tbb_task_pool_canceled(TaskPool *pool) { #ifdef WITH_TBB if (pool->use_threads) { - return pool->tbb_group.is_canceling(); + return tbb::is_current_task_group_canceling(); } #else UNUSED_VARS(pool); @@ -520,7 +520,7 @@ void BLI_task_pool_cancel(TaskPool *pool) } } -bool BLI_task_pool_canceled(TaskPool *pool) +bool BLI_task_pool_current_canceled(TaskPool *pool) { switch (pool->type) { case TASK_POOL_TBB: |