[Bf-blender-cvs] [8fe14997966] master: Cleanup: Use const arguments for node interface socket functions
Hans Goudey
noreply at git.blender.org
Wed Dec 21 19:29:08 CET 2022
Commit: 8fe1499796647d6d053a04158767c91f9f9f022d
Author: Hans Goudey
Date: Tue Dec 20 22:42:59 2022 -0600
Branches: master
https://developer.blender.org/rB8fe1499796647d6d053a04158767c91f9f9f022d
Cleanup: Use const arguments for node interface socket functions
===================================================================
M source/blender/blenkernel/BKE_node.h
M source/blender/blenkernel/intern/node.cc
M source/blender/makesrna/intern/rna_nodetree.c
M source/blender/nodes/intern/node_socket.cc
===================================================================
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index 5a1198791fb..ff1128246f3 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -183,8 +183,8 @@ typedef struct bNodeSocketType {
const char *data_path);
void (*interface_from_socket)(struct bNodeTree *ntree,
struct bNodeSocket *interface_socket,
- struct bNode *node,
- struct bNodeSocket *sock);
+ const struct bNode *node,
+ const struct bNodeSocket *sock);
/* RNA integration */
ExtensionRNA ext_socket;
@@ -563,17 +563,17 @@ struct bNodeSocket *ntreeInsertSocketInterface(struct bNodeTree *ntree,
struct bNodeSocket *next_sock,
const char *name);
struct bNodeSocket *ntreeAddSocketInterfaceFromSocket(struct bNodeTree *ntree,
- struct bNode *from_node,
- struct bNodeSocket *from_sock);
+ const struct bNode *from_node,
+ const struct bNodeSocket *from_sock);
struct bNodeSocket *ntreeAddSocketInterfaceFromSocketWithName(struct bNodeTree *ntree,
- struct bNode *from_node,
- struct bNodeSocket *from_sock,
+ const struct bNode *from_node,
+ const struct bNodeSocket *from_sock,
const char *idname,
const char *name);
struct bNodeSocket *ntreeInsertSocketInterfaceFromSocket(struct bNodeTree *ntree,
struct bNodeSocket *next_sock,
- struct bNode *from_node,
- struct bNodeSocket *from_sock);
+ const struct bNode *from_node,
+ const struct bNodeSocket *from_sock);
void ntreeRemoveSocketInterface(struct bNodeTree *ntree, struct bNodeSocket *sock);
/** \} */
diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc
index 66c90745110..9488d3a40ef 100644
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@ -3388,16 +3388,16 @@ bNodeSocket *ntreeInsertSocketInterface(bNodeTree *ntree,
}
bNodeSocket *ntreeAddSocketInterfaceFromSocket(bNodeTree *ntree,
- bNode *from_node,
- bNodeSocket *from_sock)
+ const bNode *from_node,
+ const bNodeSocket *from_sock)
{
return ntreeAddSocketInterfaceFromSocketWithName(
ntree, from_node, from_sock, from_sock->idname, from_sock->name);
}
bNodeSocket *ntreeAddSocketInterfaceFromSocketWithName(bNodeTree *ntree,
- bNode *from_node,
- bNodeSocket *from_sock,
+ const bNode *from_node,
+ const bNodeSocket *from_sock,
const char *idname,
const char *name)
{
@@ -3413,8 +3413,8 @@ bNodeSocket *ntreeAddSocketInterfaceFromSocketWithName(bNodeTree *ntree,
bNodeSocket *ntreeInsertSocketInterfaceFromSocket(bNodeTree *ntree,
bNodeSocket *next_sock,
- bNode *from_node,
- bNodeSocket *from_sock)
+ const bNode *from_node,
+ const bNodeSocket *from_sock)
{
bNodeSocket *iosock = ntreeInsertSocketInterface(
ntree,
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index 7e12483a543..fbc13229a3d 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -2983,8 +2983,8 @@ static void rna_NodeSocketInterface_init_socket(bNodeTree *ntree,
static void rna_NodeSocketInterface_from_socket(bNodeTree *ntree,
bNodeSocket *interface_socket,
- bNode *node,
- bNodeSocket *sock)
+ const bNode *node,
+ const bNodeSocket *sock)
{
extern FunctionRNA rna_NodeSocketInterface_from_socket_func;
@@ -2997,8 +2997,8 @@ static void rna_NodeSocketInterface_from_socket(bNodeTree *ntree,
}
RNA_pointer_create((ID *)ntree, &RNA_NodeSocketInterface, interface_socket, &ptr);
- RNA_pointer_create((ID *)ntree, &RNA_Node, node, &node_ptr);
- RNA_pointer_create((ID *)ntree, &RNA_NodeSocket, sock, &sock_ptr);
+ RNA_pointer_create((ID *)ntree, &RNA_Node, (bNode *)node, &node_ptr);
+ RNA_pointer_create((ID *)ntree, &RNA_NodeSocket, (bNodeSocket *)sock, &sock_ptr);
// RNA_struct_find_function(&ptr, "from_socket");
func = &rna_NodeSocketInterface_from_socket_func;
diff --git a/source/blender/nodes/intern/node_socket.cc b/source/blender/nodes/intern/node_socket.cc
index 02611bb675f..5098e55ea65 100644
--- a/source/blender/nodes/intern/node_socket.cc
+++ b/source/blender/nodes/intern/node_socket.cc
@@ -595,8 +595,8 @@ static void standard_node_socket_interface_verify_socket(bNodeTree * /*ntree*/,
static void standard_node_socket_interface_from_socket(bNodeTree * /*ntree*/,
bNodeSocket *stemp,
- bNode * /*node*/,
- bNodeSocket *sock)
+ const bNode * /*node*/,
+ const bNodeSocket *sock)
{
/* initialize settings */
stemp->type = stemp->typeinfo->type;
More information about the Bf-blender-cvs
mailing list