blender
/
blender
136
405
Fork 586
Code Issues 6.2k Pull Requests 759 Projects 19 Wiki Activity

Cleanup: Use const arguments for node interface socket functions

This commit is contained in:
Hans Goudey 2022-12-20 22:42:59 -06:00
parent 688086e01f
commit 8fe1499796
4 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/blenkernel/BKE_node.h
View File

@ -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);
/** \} */

12
source/blender/blenkernel/intern/node.cc
View File

@ -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,

8
source/blender/makesrna/intern/rna_nodetree.c
View File

@ -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;

4
source/blender/nodes/intern/node_socket.cc
View File

@ -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;