[Bf-blender-cvs] [dd01ce2cd07] master: Fix T94322: add missing updates after recent refactor

Jacques Lucke noreply at git.blender.org
Fri Dec 24 13:39:58 CET 2021


Commit: dd01ce2cd079e4a772bbb192022cd5a972c7503e
Author: Jacques Lucke
Date:   Fri Dec 24 13:39:50 2021 +0100
Branches: master
https://developer.blender.org/rBdd01ce2cd079e4a772bbb192022cd5a972c7503e

Fix T94322: add missing updates after recent refactor

This was a regression in rB7e712b2d6a0d257d272ed35622b41d06274af8df.

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

M	source/blender/editors/space_node/node_add.cc
M	source/blender/editors/space_node/node_edit.cc
M	source/blender/editors/space_node/node_relationships.cc

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

diff --git a/source/blender/editors/space_node/node_add.cc b/source/blender/editors/space_node/node_add.cc
index 0bb090f9a5f..78683a69db3 100644
--- a/source/blender/editors/space_node/node_add.cc
+++ b/source/blender/editors/space_node/node_add.cc
@@ -85,7 +85,7 @@ bNode *node_add_node(const bContext &C, const char *idname, int type, float locx
   nodeSetSelected(node, true);
 
   ED_node_set_active(&bmain, &snode, snode.edittree, node, nullptr);
-  BKE_ntree_update_main_tree(&bmain, snode.edittree, nullptr);
+  ED_node_tree_propagate_change(&C, &bmain, snode.edittree);
   return node;
 }
 
diff --git a/source/blender/editors/space_node/node_edit.cc b/source/blender/editors/space_node/node_edit.cc
index 7539f4cf70b..3b34d0b386e 100644
--- a/source/blender/editors/space_node/node_edit.cc
+++ b/source/blender/editors/space_node/node_edit.cc
@@ -423,6 +423,7 @@ void ED_node_tree_propagate_change(const bContext *C, Main *bmain, bNodeTree *ro
   NodeTreeUpdateExtraParams params = {nullptr};
   params.tree_changed_fn = [](ID *id, bNodeTree *ntree, void *UNUSED(user_data)) {
     send_notifiers_after_tree_change(id, ntree);
+    DEG_id_tag_update(&ntree->id, ID_RECALC_COPY_ON_WRITE);
   };
   params.tree_output_changed_fn = [](ID *UNUSED(id), bNodeTree *ntree, void *UNUSED(user_data)) {
     DEG_id_tag_update(&ntree->id, ID_RECALC_NTREE_OUTPUT);
diff --git a/source/blender/editors/space_node/node_relationships.cc b/source/blender/editors/space_node/node_relationships.cc
index c441cf14683..663b3a4c89a 100644
--- a/source/blender/editors/space_node/node_relationships.cc
+++ b/source/blender/editors/space_node/node_relationships.cc
@@ -695,7 +695,7 @@ static int link_socket_to_viewer(const bContext &C,
     ED_spreadsheet_context_paths_set_geometry_node(CTX_data_main(&C), &snode, viewer_bnode);
   }
 
-  BKE_ntree_update_main_tree(CTX_data_main(&C), &btree, nullptr);
+  ED_node_tree_propagate_change(&C, CTX_data_main(&C), &btree);
   return OPERATOR_FINISHED;
 }



More information about the Bf-blender-cvs mailing list