archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: Rename ExtensionRNA variables from ext to rna_ext

Browse Source 
Makes it more clear that code using this is related to the RNA
integration of a type.
Part of T74432.

Also ran clang-format on affected files.
This commit is contained in:
Julian Eisel
2020-04-03 18:24:08 +02:00
parent 70b061b4fd
commit 63922c5056
38 changed files with 345 additions and 342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/blenkernel/intern/node.c
View File

@@ -3625,9 +3625,9 @@ void node_type_base(bNodeType *ntype, int type, const char *name, short nclass,
#define DefNode(Category, ID, DefFunc, EnumName, StructName, UIName, UIDesc) \
case ID: \
BLI_strncpy(ntype->idname, #Category #StructName, sizeof(ntype->idname)); \
ntype->ext.srna = RNA_struct_find(#Category #StructName); \
BLI_assert(ntype->ext.srna != NULL); \
RNA_struct_blender_type_set(ntype->ext.srna, ntype); \
ntype->rna_ext.srna = RNA_struct_find(#Category #StructName); \
BLI_assert(ntype->rna_ext.srna != NULL); \
RNA_struct_blender_type_set(ntype->rna_ext.srna, ntype); \
break;
switch (type) {
@@ -4142,8 +4142,8 @@ void free_nodesystem(void)
{
if (nodetypes_hash) {
NODE_TYPES_BEGIN (nt) {
if (nt->ext.free) {
nt->ext.free(nt->ext.data);
if (nt->rna_ext.free) {
nt->rna_ext.free(nt->rna_ext.data);
}
}
NODE_TYPES_END;
@@ -4169,8 +4169,8 @@ void free_nodesystem(void)
if (nodetreetypes_hash) {
NODE_TREE_TYPES_BEGIN (nt) {
if (nt->ext.free) {
nt->ext.free(nt->ext.data);
if (nt->rna_ext.free) {
nt->rna_ext.free(nt->rna_ext.data);
}
}
NODE_TREE_TYPES_END;