griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: Extract function to make extend node declaration

Browse Source
This commit is contained in:
Hans Goudey
2023-04-28 10:24:25 -04:00
parent 098e58ea24
commit d6c61ccadc
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/nodes/NOD_socket_declarations.hh
View File

@@ -403,4 +403,6 @@ inline Image::Image() : IDSocketDeclaration("NodeSocketImage") {}
/** \} */
SocketDeclarationPtr create_extend_declaration(const eNodeSocketInOut in_out);
} // namespace blender::nodes::decl

13
source/blender/nodes/intern/node_common.cc
View File

@@ -485,15 +485,6 @@ bNodeSocket *node_group_input_find_socket(bNode *node, const char *identifier)
namespace blender::nodes {
static SocketDeclarationPtr extend_declaration(const eNodeSocketInOut in_out)
{
std::unique_ptr<decl::Extend> decl = std::make_unique<decl::Extend>();
decl->name = "";
decl->identifier = "__extend__";
decl->in_out = in_out;
return decl;
}
static void group_input_declare_dynamic(const bNodeTree &node_tree,
const bNode & /*node*/,
NodeDeclaration &r_declaration)
@@ -502,7 +493,7 @@ static void group_input_declare_dynamic(const bNodeTree &node_tree,
r_declaration.outputs.append(declaration_for_interface_socket(node_tree, *input));
r_declaration.outputs.last()->in_out = SOCK_OUT;
}
r_declaration.outputs.append(extend_declaration(SOCK_OUT));
r_declaration.outputs.append(decl::create_extend_declaration(SOCK_OUT));
}
static void group_output_declare_dynamic(const bNodeTree &node_tree,
@@ -513,7 +504,7 @@ static void group_output_declare_dynamic(const bNodeTree &node_tree,
r_declaration.inputs.append(declaration_for_interface_socket(node_tree, *input));
r_declaration.inputs.last()->in_out = SOCK_IN;
}
r_declaration.inputs.append(extend_declaration(SOCK_IN));
r_declaration.inputs.append(decl::create_extend_declaration(SOCK_IN));
}
static bool group_input_insert_link(bNodeTree *ntree, bNode *node, bNodeLink *link)

9
source/blender/nodes/intern/node_socket_declarations.cc
View File

@@ -664,6 +664,15 @@ bNodeSocket &Custom::update_or_build(bNodeTree & /*ntree*/,
return socket;
}
SocketDeclarationPtr create_extend_declaration(const eNodeSocketInOut in_out)
{
std::unique_ptr<decl::Extend> decl = std::make_unique<decl::Extend>();
decl->name = "";
decl->identifier = "__extend__";
decl->in_out = in_out;
return decl;
}
/** \} */
} // namespace blender::nodes::decl