[Bf-blender-cvs] [cc3d3a453e7] master: Fix: Broken build with TBB disabled.
Ray Molenkamp
noreply at git.blender.org
Thu May 14 18:39:18 CEST 2020
Commit: cc3d3a453e769a57399b1eae371d7bde9b67731c
Author: Ray Molenkamp
Date: Thu May 14 10:39:12 2020 -0600
Branches: master
https://developer.blender.org/rBcc3d3a453e769a57399b1eae371d7bde9b67731c
Fix: Broken build with TBB disabled.
Lite builds without TBB and still needs the alternative codepath
===================================================================
M source/blender/blenlib/intern/task_pool.cc
===================================================================
diff --git a/source/blender/blenlib/intern/task_pool.cc b/source/blender/blenlib/intern/task_pool.cc
index 42b635afcf1..670787697a3 100644
--- a/source/blender/blenlib/intern/task_pool.cc
+++ b/source/blender/blenlib/intern/task_pool.cc
@@ -114,7 +114,11 @@ class Task {
/* Execute task. */
void operator()() const
{
+#ifdef WITH_TBB
tbb::this_task_arena::isolate([this] { run(pool, taskdata); });
+#else
+ run(pool, taskdata);
+#endif
}
};
More information about the Bf-blender-cvs
mailing list