griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T86966: crash when rendering with geometry nodes

Browse Source 
UI hints should only be modified when the depsgraph is active.
Otherwise two threads evaluating the same object in different depsgraphs
can conflict with each other.
This commit is contained in:
Jacques Lucke
2021-03-29 10:07:40 +02:00
parent 4e34baddb9
commit fa1569a072
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/modifiers/intern/MOD_nodes.cc
View File

@@ -414,7 +414,9 @@ class GeometryNodesEvaluator {
{
const bNode &bnode = params.node();
this->store_ui_hints(node, params);
if (DEG_is_active(depsgraph_)) {
this->store_ui_hints(node, params);
}
/* Use the geometry-node-execute callback if it exists. */
if (bnode.typeinfo->geometry_node_execute != nullptr) {
@@ -1197,7 +1199,9 @@ static void modifyGeometry(ModifierData *md,
return;
}
reset_tree_ui_storage(tree.used_node_tree_refs(), *ctx->object, *md);
if (DEG_is_active(ctx->depsgraph)) {
reset_tree_ui_storage(tree.used_node_tree_refs(), *ctx->object, *md);
}
geometry_set = compute_geometry(
tree, group_inputs, *group_outputs[0], std::move(geometry_set), nmd, ctx);