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

Cleanup: correct function name

Browse Source
This commit is contained in:
Jacques Lucke
2024-04-30 11:14:40 +02:00
parent 7114c44c9b
commit d550db1288
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/makesrna/intern/rna_nodetree.cc
View File

@@ -3445,7 +3445,7 @@ typename Accessor::ItemT *rna_Node_ItemArray_new_with_socket_and_name(
BKE_report(reports, RPT_ERROR, "Unable to create item with this socket type");
return nullptr;
}
ItemT *new_item = blender::nodes::socket_items::add_item_with_socket_and_name<Accessor>(
ItemT *new_item = blender::nodes::socket_items::add_item_with_socket_type_and_name<Accessor>(
*node, eNodeSocketDatatype(socket_type), name);
bNodeTree *ntree = reinterpret_cast<bNodeTree *>(id);

5
source/blender/nodes/NOD_socket_items.hh
View File

@@ -161,7 +161,7 @@ template<typename Accessor> inline typename Accessor::ItemT &add_item_to_array(b
* Add a new item at the end with the given socket type and name.
*/
template<typename Accessor>
inline typename Accessor::ItemT *add_item_with_socket_and_name(
inline typename Accessor::ItemT *add_item_with_socket_type_and_name(
bNode &node, const eNodeSocketDatatype socket_type, const char *name)
{
using ItemT = typename Accessor::ItemT;
@@ -224,7 +224,8 @@ template<typename Accessor>
if (!Accessor::supports_socket_type(socket_type)) {
return false;
}
item = add_item_with_socket_and_name<Accessor>(storage_node, socket_type, src_socket->name);
item = add_item_with_socket_type_and_name<Accessor>(
storage_node, socket_type, src_socket->name);
}
else if constexpr (Accessor::has_name && !Accessor::has_type) {
item = add_item_with_name<Accessor>(storage_node, src_socket->name);

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

@@ -145,7 +145,7 @@ inline void add_item(wmOperatorType *ot,
}
if constexpr (Accessor::has_type && Accessor::has_name) {
socket_items::add_item_with_socket_and_name<Accessor>(
socket_items::add_item_with_socket_type_and_name<Accessor>(
node,
active_item ? eNodeSocketDatatype(active_item->socket_type) : SOCK_GEOMETRY,
/* Empty name so it is based on the type. */