From 3732508c64ad51c77a6fb83a2444af104d95cfd9 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 15 Jan 2021 17:21:14 +0100 Subject: Fix T84745: build error with TBB 2021 task_group::is_canceling() was removed. --- source/blender/blenlib/intern/task_pool.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/blenlib/intern') 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: -- cgit v1.2.3