diff options
author | Jacques Lucke <jacques@blender.org> | 2022-03-16 13:23:45 +0300 |
---|---|---|
committer | Philipp Oeser <info@graphics-engineer.com> | 2022-03-21 15:28:42 +0300 |
commit | 731f3777836999c425888e22dba140bda18a09be (patch) | |
tree | 98a671614cf65c0d4eed69ed1a8d22de13aaa630 | |
parent | 27bef3ee02ce776d4e2d00dab349444c4d394841 (diff) |
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.
-rw-r--r-- | source/blender/editors/space_node/node_templates.cc | 7 |
1 files 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); |