Commit: 3819a9b15a1936753cc50e4535d27aebe81ae568
Author: Jacques Lucke
Date: Thu Jan 5 15:36:24 2023 +0100
Branches: master
https://developer.blender.org/rB3819a9b15a1936753cc50e4535d27aebe81ae568
Fix T103614: crash during geometry nodes evaluation with tbb disabled
===================================================================
M source/blender/functions/intern/lazy_function_graph_executor.cc
===================================================================
diff --git a/source/blender/functions/intern/lazy_function_graph_executor.cc
b/source/blender/functions/intern/lazy_function_graph_executor.cc
index fc74b3cd213..ab7dfba196a 100644
--- a/source/blender/functions/intern/lazy_function_graph_executor.cc
+++ b/source/blender/functions/intern/lazy_function_graph_executor.cc
@@ -1073,6 +1073,12 @@ class Executor {
bool try_enable_multi_threading()
{
+#ifndef WITH_TBB
+ /* The non-tbb task pool has the property that it immediately executes
tasks under some
+ * circumstances. This is not supported here because tasks might be
scheduled while another
+ * node is in the middle of being executed on the same thread. */
+ return false;
+#endif
if (this->use_multi_threading()) {
return true;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
