[Bf-blender-cvs] [c481549870e] master: Cleanup: Remove unused node clipboard type handling

Hans Goudey noreply at git.blender.org
Thu Nov 17 01:01:51 CET 2022


Commit: c481549870eedbf044c47b55cd8df0f099b07475
Author: Hans Goudey
Date:   Wed Nov 16 18:01:34 2022 -0600
Branches: master
https://developer.blender.org/rBc481549870eedbf044c47b55cd8df0f099b07475

Cleanup: Remove unused node clipboard type handling

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

M	source/blender/blenkernel/BKE_node.h
M	source/blender/blenkernel/intern/node.cc
M	source/blender/editors/space_node/node_edit.cc

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

diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index 51a529c7dca..1a36f3be0b2 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -861,7 +861,6 @@ void nodeSocketDeclarationsUpdate(struct bNode *node);
 /**
  * Node Clipboard.
  */
-void BKE_node_clipboard_init(const struct bNodeTree *ntree);
 void BKE_node_clipboard_clear(void);
 void BKE_node_clipboard_free(void);
 /**
@@ -872,7 +871,6 @@ void BKE_node_clipboard_add_node(struct bNode *node);
 void BKE_node_clipboard_add_link(struct bNodeLink *link);
 const struct ListBase *BKE_node_clipboard_get_nodes(void);
 const struct ListBase *BKE_node_clipboard_get_links(void);
-int BKE_node_clipboard_get_type(void);
 
 /**
  * Node Instance Hash.
diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc
index b887f84b51d..96165fb6209 100644
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@ -3779,16 +3779,10 @@ struct bNodeClipboard {
 #endif
 
   ListBase links;
-  int type;
 };
 
 static bNodeClipboard node_clipboard = {{nullptr}};
 
-void BKE_node_clipboard_init(const struct bNodeTree *ntree)
-{
-  node_clipboard.type = ntree->type;
-}
-
 void BKE_node_clipboard_clear()
 {
   LISTBASE_FOREACH_MUTABLE (bNodeLink *, link, &node_clipboard.links) {
@@ -3894,11 +3888,6 @@ const ListBase *BKE_node_clipboard_get_links()
   return &node_clipboard.links;
 }
 
-int BKE_node_clipboard_get_type()
-{
-  return node_clipboard.type;
-}
-
 void BKE_node_clipboard_free()
 {
   BKE_node_clipboard_validate();
diff --git a/source/blender/editors/space_node/node_edit.cc b/source/blender/editors/space_node/node_edit.cc
index 10e37f7cd02..fe3126a3c23 100644
--- a/source/blender/editors/space_node/node_edit.cc
+++ b/source/blender/editors/space_node/node_edit.cc
@@ -2242,7 +2242,6 @@ static int node_clipboard_copy_exec(bContext *C, wmOperator * /*op*/)
 
   /* clear current clipboard */
   BKE_node_clipboard_clear();
-  BKE_node_clipboard_init(ntree);
 
   Map<const bNode *, bNode *> node_map;
   Map<const bNodeSocket *, bNodeSocket *> socket_map;



More information about the Bf-blender-cvs mailing list