blender
/
blender
135
420
Fork 602
Code Issues 6.3k Pull Requests 754 Projects 19 Wiki Activity

Cleanup: avoid using NOD_static_types.h for creating the node.type enum #110810

Merged
Jacques Lucke merged 4 commits from JacquesLucke/blender:avoid-using-nod-static-types-for-enum-items into main 2023-08-04 21:44:00 +02:00
Conversation 2 Commits 4 Files Changed 3 +16 -10
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -238,6 +238,8 @@ typedef struct bNodeType {
char ui_name[64]; /* MAX_NAME */
char ui_description[256];
int ui_icon;
/** Should usually use the idname instead, but this enum type is still exposed in Python. */
const char *enum_name_legacy;
float width, minwidth, maxwidth;
float height, minheight, maxheight;

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

@ -4503,6 +4503,8 @@ void node_type_base(bNodeType *ntype, const int type, const char *name, const sh
ntype->rna_ext.srna = RNA_struct_find(#Category #StructName); \
BLI_assert(ntype->rna_ext.srna != nullptr); \
RNA_struct_blender_type_set(ntype->rna_ext.srna, ntype); \
ntype->enum_name_legacy = EnumName; \
STRNCPY(ntype->ui_description, UIDesc); \
break;
switch (type) {

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

@ -784,17 +784,19 @@ static const EnumPropertyItem *rna_node_static_type_itemf(bContext * /*C*/,
category = "FunctionNode";
}
# define DefNode(Category, ID, DefFunc, EnumName, StructName, UIName, UIDesc) \
if (STREQ(#Category, "Node") || STREQ(#Category, category)) { \
tmp.value = ID; \
tmp.identifier = EnumName; \
tmp.name = UIName; \
tmp.description = UIDesc; \
tmp.icon = ICON_NONE; \
RNA_enum_item_add(&item, &totitem, &tmp); \
NODE_TYPES_BEGIN (ntype) {
if (ntype->enum_name_legacy &&
(BLI_str_startswith(ntype->idname, "Node") || BLI_str_startswith(ntype->idname, category)))
{
tmp.value = ntype->type;
tmp.identifier = ntype->enum_name_legacy;
tmp.name = ntype->ui_name;
tmp.description = ntype->ui_description;
tmp.icon = ICON_NONE;
RNA_enum_item_add(&item, &totitem, &tmp);
}
# include "../../nodes/NOD_static_types.h"
# undef DefNode
}
NODE_TYPES_END;
RNA_enum_item_end(&item, &totitem);
*r_free = true;