[Bf-blender-cvs] [79ae5f50149] master: Fix T96386: crash when changing shader to node group in properties

[Jacques Lucke]

Commit: 79ae5f50149a4015624ec8a36c45a72e6d45798a
Author: Jacques Lucke
Date:   Wed Mar 16 11:23:45 2022 +0100
Branches: master
https://developer.blender.org/rB79ae5f50149a4015624ec8a36c45a72e6d45798a

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.

===================================================================

M	source/blender/editors/space_node/node_templates.cc

===================================================================

diff --git a/source/blender/editors/space_node/node_templates.cc b/source/blender/editors/space_node/node_templates.cc
index 8cd87574465..b63cb2eeee5 100644
--- a/source/blender/editors/space_node/node_templates.cc
+++ b/source/blender/editors/space_node/node_templates.cc
@@ -69,11 +69,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 */
@@ -237,7 +237,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);