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/makesrna/intern/rna_animation.c | |
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/makesrna/intern/rna_animation.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_animation.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/source/blender/makesrna/intern/rna_animation.c b/source/blender/makesrna/intern/rna_animation.c index 86391bdc40d..7ea44bce6db 100644 --- a/source/blender/makesrna/intern/rna_animation.c +++ b/source/blender/makesrna/intern/rna_animation.c @@ -194,7 +194,7 @@ static bool RKS_POLL_rna_internal(KeyingSetInfo *ksi, bContext *C) void *ret; int ok; - RNA_pointer_create(NULL, ksi->ext.srna, ksi, &ptr); + RNA_pointer_create(NULL, ksi->rna_ext.srna, ksi, &ptr); func = &rna_KeyingSetInfo_poll_func; /* RNA_struct_find_function(&ptr, "poll"); */ RNA_parameter_list_create(&list, &ptr, func); @@ -204,7 +204,7 @@ static bool RKS_POLL_rna_internal(KeyingSetInfo *ksi, bContext *C) RNA_parameter_set_lookup(&list, "context", &C); /* execute the function */ - ksi->ext.call(C, &ptr, func, &list); + ksi->rna_ext.call(C, &ptr, func, &list); /* read the result */ RNA_parameter_get_lookup(&list, "ok", &ret); @@ -224,7 +224,7 @@ static void RKS_ITER_rna_internal(KeyingSetInfo *ksi, bContext *C, KeyingSet *ks ParameterList list; FunctionRNA *func; - RNA_pointer_create(NULL, ksi->ext.srna, ksi, &ptr); + RNA_pointer_create(NULL, ksi->rna_ext.srna, ksi, &ptr); func = &rna_KeyingSetInfo_iterator_func; /* RNA_struct_find_function(&ptr, "poll"); */ RNA_parameter_list_create(&list, &ptr, func); @@ -235,7 +235,7 @@ static void RKS_ITER_rna_internal(KeyingSetInfo *ksi, bContext *C, KeyingSet *ks RNA_parameter_set_lookup(&list, "ks", &ks); /* execute the function */ - ksi->ext.call(C, &ptr, func, &list); + ksi->rna_ext.call(C, &ptr, func, &list); } RNA_parameter_list_free(&list); } @@ -249,7 +249,7 @@ static void RKS_GEN_rna_internal(KeyingSetInfo *ksi, bContext *C, KeyingSet *ks, ParameterList list; FunctionRNA *func; - RNA_pointer_create(NULL, ksi->ext.srna, ksi, &ptr); + RNA_pointer_create(NULL, ksi->rna_ext.srna, ksi, &ptr); func = &rna_KeyingSetInfo_generate_func; /* RNA_struct_find_generate(&ptr, "poll"); */ RNA_parameter_list_create(&list, &ptr, func); @@ -261,7 +261,7 @@ static void RKS_GEN_rna_internal(KeyingSetInfo *ksi, bContext *C, KeyingSet *ks, RNA_parameter_set_lookup(&list, "data", data); /* execute the function */ - ksi->ext.call(C, &ptr, func, &list); + ksi->rna_ext.call(C, &ptr, func, &list); } RNA_parameter_list_free(&list); } @@ -273,7 +273,7 @@ static void RKS_GEN_rna_internal(KeyingSetInfo *ksi, bContext *C, KeyingSet *ks, static StructRNA *rna_KeyingSetInfo_refine(PointerRNA *ptr) { KeyingSetInfo *ksi = (KeyingSetInfo *)ptr->data; - return (ksi->ext.srna) ? ksi->ext.srna : &RNA_KeyingSetInfo; + return (ksi->rna_ext.srna) ? ksi->rna_ext.srna : &RNA_KeyingSetInfo; } static void rna_KeyingSetInfo_unregister(Main *bmain, StructRNA *type) @@ -285,7 +285,7 @@ static void rna_KeyingSetInfo_unregister(Main *bmain, StructRNA *type) } /* free RNA data referencing this */ - RNA_struct_free_extension(type, &ksi->ext); + RNA_struct_free_extension(type, &ksi->rna_ext); RNA_struct_free(&BLENDER_RNA, type); WM_main_add_notifier(NC_WINDOW, NULL); @@ -328,8 +328,8 @@ static StructRNA *rna_KeyingSetInfo_register(Main *bmain, /* check if we have registered this info before, and remove it */ ksi = ANIM_keyingset_info_find_name(dummyksi.idname); - if (ksi && ksi->ext.srna) { - rna_KeyingSetInfo_unregister(bmain, ksi->ext.srna); + if (ksi && ksi->rna_ext.srna) { + rna_KeyingSetInfo_unregister(bmain, ksi->rna_ext.srna); } /* create a new KeyingSetInfo type */ @@ -337,11 +337,11 @@ static StructRNA *rna_KeyingSetInfo_register(Main *bmain, memcpy(ksi, &dummyksi, sizeof(KeyingSetInfo)); /* set RNA-extensions info */ - ksi->ext.srna = RNA_def_struct_ptr(&BLENDER_RNA, ksi->idname, &RNA_KeyingSetInfo); - ksi->ext.data = data; - ksi->ext.call = call; - ksi->ext.free = free; - RNA_struct_blender_type_set(ksi->ext.srna, ksi); + ksi->rna_ext.srna = RNA_def_struct_ptr(&BLENDER_RNA, ksi->idname, &RNA_KeyingSetInfo); + ksi->rna_ext.data = data; + ksi->rna_ext.call = call; + ksi->rna_ext.free = free; + RNA_struct_blender_type_set(ksi->rna_ext.srna, ksi); /* set callbacks */ /* NOTE: we really should have all of these... */ @@ -355,7 +355,7 @@ static StructRNA *rna_KeyingSetInfo_register(Main *bmain, WM_main_add_notifier(NC_WINDOW, NULL); /* return the struct-rna added */ - return ksi->ext.srna; + return ksi->rna_ext.srna; } /* ****************************** */ |