diff options
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_addon.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_keyconfig.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_node.h | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_screen.h | 8 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/node.c | 14 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/screen.c | 8 |
6 files changed, 19 insertions, 19 deletions
diff --git a/source/blender/blenkernel/BKE_addon.h b/source/blender/blenkernel/BKE_addon.h index 7bb1761dfbe..741be17bb25 100644 --- a/source/blender/blenkernel/BKE_addon.h +++ b/source/blender/blenkernel/BKE_addon.h @@ -33,7 +33,7 @@ typedef struct bAddonPrefType { char idname[64]; // best keep the same size as BKE_ST_MAXNAME /* RNA integration */ - ExtensionRNA ext; + ExtensionRNA rna_ext; } bAddonPrefType; #else diff --git a/source/blender/blenkernel/BKE_keyconfig.h b/source/blender/blenkernel/BKE_keyconfig.h index 711d0292f75..bc33cc2669e 100644 --- a/source/blender/blenkernel/BKE_keyconfig.h +++ b/source/blender/blenkernel/BKE_keyconfig.h @@ -37,7 +37,7 @@ typedef struct wmKeyConfigPrefType_Runtime { char idname[64]; /* RNA integration */ - ExtensionRNA ext; + ExtensionRNA rna_ext; } wmKeyConfigPrefType_Runtime; #else diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index dc06f56861a..38fe974c228 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -268,7 +268,7 @@ typedef struct bNodeType { NodeGPUExecFunction gpufunc; /* RNA integration */ - ExtensionRNA ext; + ExtensionRNA rna_ext; } bNodeType; /* nodetype->nclass, for add-menu and themes */ @@ -350,7 +350,7 @@ typedef struct bNodeTreeType { void (*node_add_init)(struct bNodeTree *ntree, struct bNode *bnode); /* RNA integration */ - ExtensionRNA ext; + ExtensionRNA rna_ext; } bNodeTreeType; /** \} */ diff --git a/source/blender/blenkernel/BKE_screen.h b/source/blender/blenkernel/BKE_screen.h index a3ff5c53828..d70718b4387 100644 --- a/source/blender/blenkernel/BKE_screen.h +++ b/source/blender/blenkernel/BKE_screen.h @@ -233,7 +233,7 @@ typedef struct PanelType { ListBase children; /* RNA integration */ - ExtensionRNA ext; + ExtensionRNA rna_ext; } PanelType; /* uilist types */ @@ -271,7 +271,7 @@ typedef struct uiListType { uiListFilterItemsFunc filter_items; /* RNA integration */ - ExtensionRNA ext; + ExtensionRNA rna_ext; } uiListType; /* header types */ @@ -288,7 +288,7 @@ typedef struct HeaderType { void (*draw)(const struct bContext *C, struct Header *header); /* RNA integration */ - ExtensionRNA ext; + ExtensionRNA rna_ext; } HeaderType; typedef struct Header { @@ -313,7 +313,7 @@ typedef struct MenuType { void (*draw)(const struct bContext *C, struct Menu *menu); /* RNA integration */ - ExtensionRNA ext; + ExtensionRNA rna_ext; } MenuType; typedef struct Menu { diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index de5f9d34f6c..98a7673c9d5 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -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; diff --git a/source/blender/blenkernel/intern/screen.c b/source/blender/blenkernel/intern/screen.c index 7ad08dc1ad5..37ea6c2cb4d 100644 --- a/source/blender/blenkernel/intern/screen.c +++ b/source/blender/blenkernel/intern/screen.c @@ -104,16 +104,16 @@ static void spacetype_free(SpaceType *st) BLI_freelistN(&art->drawcalls); for (pt = art->paneltypes.first; pt; pt = pt->next) { - if (pt->ext.free) { - pt->ext.free(pt->ext.data); + if (pt->rna_ext.free) { + pt->rna_ext.free(pt->rna_ext.data); } BLI_freelistN(&pt->children); } for (ht = art->headertypes.first; ht; ht = ht->next) { - if (ht->ext.free) { - ht->ext.free(ht->ext.data); + if (ht->rna_ext.free) { + ht->rna_ext.free(ht->rna_ext.data); } } |