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

Fix #101702: EEVEE: Script node with shader output crashes blender

Browse Source 
Fixed by removing connections to the script node before
doing any complex tree processing.

Pull Request: https://projects.blender.org/blender/blender/pulls/141280
This commit is contained in:
Clément Foucault
2025-07-01 16:33:06 +02:00
committed by Clément Foucault
parent 68759af516
commit caf659880f
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -452,6 +452,20 @@ static void ntree_shader_groups_expand_inputs(bNodeTree *localtree)
}
}
static void ntree_shader_unlink_script_nodes(bNodeTree *ntree)
{
/* To avoid more trouble in the node tree processing (especially inside
* `ntree_shader_weight_tree_invert()`) we disconnect the script node since they are not
* supported in EEVEE (see #101702). */
LISTBASE_FOREACH_MUTABLE (bNodeLink *, link, &ntree->links) {
if ((link->tonode->type_legacy == SH_NODE_SCRIPT) ||
(link->fromnode->type_legacy == SH_NODE_SCRIPT))
{
blender::bke::node_remove_link(ntree, *link);
}
}
}
static void ntree_shader_groups_remove_muted_links(bNodeTree *ntree)
{
LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
@@ -1230,6 +1244,7 @@ void ntreeGPUMaterialNodes(bNodeTree *localtree, GPUMaterial *mat)
{
bNodeTreeExec *exec;
ntree_shader_unlink_script_nodes(localtree);
ntree_shader_groups_remove_muted_links(localtree);
ntree_shader_groups_expand_inputs(localtree);
ntree_shader_groups_flatten(localtree);