diff options
author | Julian Eisel <julian@blender.org> | 2020-04-03 19:24:08 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2020-04-03 19:25:52 +0300 |
commit | 63922c5056d16cc91c30ec3476a28d523adbdbea (patch) | |
tree | 4255e7ff9067cff9e74bd51aac5fb350bf7d8575 /source/blender/editors | |
parent | 70b061b4fdd487c971b12fd0f772767387ebc8f4 (diff) |
Cleanup: Rename ExtensionRNA variables from ext to rna_ext
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.
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/animation/keyingsets.c | 4 | ||||
-rw-r--r-- | source/blender/editors/include/ED_keyframing.h | 2 | ||||
-rw-r--r-- | source/blender/editors/interface/interface.c | 8 | ||||
-rw-r--r-- | source/blender/editors/space_node/drawnode.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_script/script_edit.c | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/editors/animation/keyingsets.c b/source/blender/editors/animation/keyingsets.c index d30d03a1c73..89c7860982b 100644 --- a/source/blender/editors/animation/keyingsets.c +++ b/source/blender/editors/animation/keyingsets.c @@ -646,8 +646,8 @@ void ANIM_keyingset_infos_exit(void) next = ksi->next; /* free extra RNA data, and remove from list */ - if (ksi->ext.free) { - ksi->ext.free(ksi->ext.data); + if (ksi->rna_ext.free) { + ksi->rna_ext.free(ksi->rna_ext.data); } BLI_freelinkN(&keyingset_type_infos, ksi); } diff --git a/source/blender/editors/include/ED_keyframing.h b/source/blender/editors/include/ED_keyframing.h index 6cac3e60531..b362d35c09a 100644 --- a/source/blender/editors/include/ED_keyframing.h +++ b/source/blender/editors/include/ED_keyframing.h @@ -198,7 +198,7 @@ typedef struct KeyingSetInfo { cbKeyingSet_Generate generate; /* RNA integration */ - struct ExtensionRNA ext; + struct ExtensionRNA rna_ext; } KeyingSetInfo; /* -------- */ diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index 78db23a380a..11dc8b3b8b4 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -6607,8 +6607,8 @@ void UI_but_string_info_get(bContext *C, uiBut *but, ...) } else { /* Not all menus are from Python. */ - if (mt->ext.srna) { - const char *t = RNA_struct_ui_description(mt->ext.srna); + if (mt->rna_ext.srna) { + const char *t = RNA_struct_ui_description(mt->rna_ext.srna); if (t && t[0]) { tmp = BLI_strdup(t); } @@ -6625,7 +6625,7 @@ void UI_but_string_info_get(bContext *C, uiBut *but, ...) } else { /* Not all panels are from Python. */ - if (pt->ext.srna) { + if (pt->rna_ext.srna) { /* Panels don't yet have descriptions, this may be added. */ } } @@ -6644,7 +6644,7 @@ void UI_but_string_info_get(bContext *C, uiBut *but, ...) else if (ELEM(but->type, UI_BTYPE_MENU, UI_BTYPE_PULLDOWN)) { MenuType *mt = UI_but_menutype_get(but); if (mt) { - _tmp = RNA_struct_translation_context(mt->ext.srna); + _tmp = RNA_struct_translation_context(mt->rna_ext.srna); } } if (BLT_is_default_context(_tmp)) { diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index 55a5a043014..e5ca2efb26f 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -3133,7 +3133,7 @@ static void node_property_update_default(Main *bmain, Scene *UNUSED(scene), Poin static void node_socket_template_properties_update(bNodeType *ntype, bNodeSocketTemplate *stemp) { - StructRNA *srna = ntype->ext.srna; + StructRNA *srna = ntype->rna_ext.srna; PropertyRNA *prop = RNA_struct_type_find_property(srna, stemp->identifier); if (prop) { diff --git a/source/blender/editors/space_script/script_edit.c b/source/blender/editors/space_script/script_edit.c index 79311cac6b5..e9ed1cec228 100644 --- a/source/blender/editors/space_script/script_edit.c +++ b/source/blender/editors/space_script/script_edit.c @@ -92,7 +92,7 @@ static bool script_test_modal_operators(bContext *C) wmEventHandler_Op *handler = (wmEventHandler_Op *)handler_base; if (handler->op != NULL) { wmOperatorType *ot = handler->op->type; - if (ot->ext.srna) { + if (ot->rna_ext.srna) { return true; } } |