[Bf-blender-cvs] [223c6e1ead2] master: Geometry Nodes: disable multi-threading in evaluator for now
Jacques Lucke
noreply at git.blender.org
Thu May 27 09:46:59 CEST 2021
Commit: 223c6e1ead2940a89465ff66765d16ac14a992b7
Author: Jacques Lucke
Date: Thu May 27 09:43:11 2021 +0200
Branches: master
https://developer.blender.org/rB223c6e1ead2940a89465ff66765d16ac14a992b7
Geometry Nodes: disable multi-threading in evaluator for now
A deadlock could happen under certain circumstances when
geometry nodes is used on multiple objects.
Once T88598 is resolved, multi-threading can be enabled again.
Differential Revision: https://developer.blender.org/D11405
===================================================================
M source/blender/modifiers/intern/MOD_nodes_evaluator.cc
===================================================================
diff --git a/source/blender/modifiers/intern/MOD_nodes_evaluator.cc b/source/blender/modifiers/intern/MOD_nodes_evaluator.cc
index a5c6d0abce0..10ef2f4d8eb 100644
--- a/source/blender/modifiers/intern/MOD_nodes_evaluator.cc
+++ b/source/blender/modifiers/intern/MOD_nodes_evaluator.cc
@@ -380,7 +380,8 @@ class GeometryNodesEvaluator {
void execute()
{
- task_pool_ = BLI_task_pool_create(this, TASK_PRIORITY_HIGH);
+ /* Disable threading until T88598 is resolved. */
+ task_pool_ = BLI_task_pool_create_no_threads(this);
this->create_states_for_reachable_nodes();
this->forward_group_inputs();
More information about the Bf-blender-cvs
mailing list