From 731f3777836999c425888e22dba140bda18a09be Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Wed, 16 Mar 2022 11:23:45 +0100 Subject: Fix T96386: crash when changing shader to node group in properties The previous code updated the wrong node tree. The result was that the new group node did not have the socket that was supposed to be linked. --- source/blender/editors/space_node/node_templates.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/source/blender/editors/space_node/node_templates.cc b/source/blender/editors/space_node/node_templates.cc index 113e2bd3bb3..5b790002e78 100644 --- a/source/blender/editors/space_node/node_templates.cc +++ b/source/blender/editors/space_node/node_templates.cc @@ -82,11 +82,11 @@ static bool node_link_item_compare(bNode *node, NodeLinkItem *item) return true; } -static void node_link_item_apply(Main *bmain, bNode *node, NodeLinkItem *item) +static void node_link_item_apply(bNodeTree *ntree, bNode *node, NodeLinkItem *item) { if (ELEM(node->type, NODE_GROUP, NODE_CUSTOM_GROUP)) { node->id = (ID *)item->ngroup; - BKE_ntree_update_main_tree(bmain, item->ngroup, nullptr); + BKE_ntree_update_tag_node_property(ntree, node); } else { /* nothing to do for now */ @@ -250,7 +250,8 @@ static void node_socket_add_replace(const bContext *C, nodePositionRelative(node_from, node_to, sock_from_tmp, sock_to); } - node_link_item_apply(bmain, node_from, item); + node_link_item_apply(ntree, node_from, item); + ED_node_tree_propagate_change(C, bmain, ntree); } nodeSetActive(ntree, node_from); -- cgit v1.2.3