[Bf-blender-cvs] [450693ea6b7] temp-nodes-group-declarations: Make function static again

[Hans Goudey]

Commit: 450693ea6b7b57d33930646e0cc9abfd3a2997b3
Author: Hans Goudey
Date:   Thu Dec 22 14:41:31 2022 -0500
Branches: temp-nodes-group-declarations
https://developer.blender.org/rB450693ea6b7b57d33930646e0cc9abfd3a2997b3

Make function static again

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

M	source/blender/nodes/NOD_socket.h
M	source/blender/nodes/intern/node_socket.cc

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

diff --git a/source/blender/nodes/NOD_socket.h b/source/blender/nodes/NOD_socket.h
index a5b813847a4..fba4c90d813 100644
--- a/source/blender/nodes/NOD_socket.h
+++ b/source/blender/nodes/NOD_socket.h
@@ -40,10 +40,7 @@ void register_standard_node_socket_types(void);
 
 namespace blender::nodes {
 
-void refresh_node_sockets_from_declaration(bNodeTree &ntree,
-                                           bNode &node,
-                                           const NodeDeclaration &node_decl,
-                                           bool do_id_user);
+
 void update_node_declaration_and_sockets(bNodeTree &ntree, bNode &node);
 
 }  // namespace blender::nodes
diff --git a/source/blender/nodes/intern/node_socket.cc b/source/blender/nodes/intern/node_socket.cc
index 96843e57966..1e38af1c5f8 100644
--- a/source/blender/nodes/intern/node_socket.cc
+++ b/source/blender/nodes/intern/node_socket.cc
@@ -246,11 +246,14 @@ static void refresh_socket_list(bNodeTree &ntree,
   }
 }
 
-void refresh_node_sockets_from_declaration(bNodeTree &ntree,
-                                           bNode &node,
-                                           const NodeDeclaration &node_decl,
-                                           const bool do_id_user)
+static void refresh_node(bNodeTree &ntree,
+                         bNode &node,
+                         const NodeDeclaration &node_decl,
+                         const bool do_id_user)
 {
+  if (node_decl.skip_updating_sockets) {
+    return;
+  }
   if (!node_decl.matches(node)) {
     refresh_socket_list(ntree, node, node.inputs, node_decl.inputs(), do_id_user);
     refresh_socket_list(ntree, node, node.outputs, node_decl.outputs(), do_id_user);
@@ -266,7 +269,7 @@ void update_node_declaration_and_sockets(bNodeTree &ntree, bNode &node)
     }
     build_node_declaration_dynamic(ntree, node, *node.runtime->declaration);
   }
-  refresh_node_sockets_from_declaration(ntree, node, *node.runtime->declaration, true);
+  refresh_node(ntree, node, *node.runtime->declaration, true);
 }
 
 }  // namespace blender::nodes
@@ -279,7 +282,7 @@ void node_verify_sockets(bNodeTree *ntree, bNode *node, bool do_id_user)
   }
   if (ntype->declare != nullptr) {
     nodeDeclarationEnsureOnOutdatedNode(ntree, node);
-    refresh_node_sockets_from_declaration(*ntree, *node, *node->runtime->declaration, do_id_user);
+    refresh_node(*ntree, *node, *node->runtime->declaration, do_id_user);
     return;
   }
   /* Don't try to match socket lists when there are no templates.