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

Fix #147484: crash when opening window while rendering

Browse Source 
The issue here was that the node-tree-update code was accessing data in `bmain`
when it shouldn't. The fix is to just use the correct API for this use-case when
updating a temporary node tree. It doesn't need `bmain` in this case.

Pull Request: https://projects.blender.org/blender/blender/pulls/147611
This commit is contained in:
Jacques Lucke
2025-10-09 11:02:00 +02:00
parent 8b5c13ac28
commit 17954b8d8d
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenkernel/intern/node_tree_update.cc
View File

@@ -2189,6 +2189,7 @@ void BKE_ntree_update_after_single_tree_change(Main &bmain,
void BKE_ntree_update_without_main(bNodeTree &tree)
{
BLI_assert(tree.id.tag & ID_TAG_NO_MAIN);
if (is_updating) {
return;
}

10
source/blender/nodes/shader/node_shader_tree.cc
View File

@@ -437,12 +437,12 @@ static bool ntree_shader_implicit_closure_cast(bNodeTree *ntree)
}
else if ((link->fromsock->type == SOCK_SHADER) && (link->tosock->type != SOCK_SHADER)) {
blender::bke::node_remove_link(ntree, *link);
BKE_ntree_update_after_single_tree_change(*G.main, *ntree);
BKE_ntree_update_without_main(*ntree);
modified = true;
}
}
if (modified) {
BKE_ntree_update_after_single_tree_change(*G.main, *ntree);
BKE_ntree_update_without_main(*ntree);
}
return true;
}
@@ -736,7 +736,7 @@ static void ntree_shader_weight_tree_invert(bNodeTree *ntree, bNode *output_node
*output_node,
*thickness_output);
}
BKE_ntree_update_after_single_tree_change(*G.main, *ntree);
BKE_ntree_update_without_main(*ntree);
}
static bool closure_node_filter(const bNode *node)
@@ -788,7 +788,7 @@ static void ntree_shader_shader_to_rgba_branches(bNodeTree *ntree)
continue;
}
ntree_shader_copy_branch(ntree, shader_to_rgba, closure_node_filter);
BKE_ntree_update_after_single_tree_change(*G.main, *ntree);
BKE_ntree_update_without_main(*ntree);
ntree_shader_weight_tree_invert(ntree, shader_to_rgba);
}
@@ -981,7 +981,7 @@ static void ntree_shader_pruned_unused(bNodeTree *ntree, bNode *output_node)
}
if (changed) {
BKE_ntree_update_after_single_tree_change(*G.main, *ntree);
BKE_ntree_update_without_main(*ntree);
}
}