diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-01-31 11:03:45 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-01-31 11:03:45 +0300 |
| commit | 6d55b522feb61a6cc03d04cbc2fca23713964084 (patch) | |
| tree | ca59c77a7db79e09d08b15f585fa90ae763f7a00 /source/blender/makesrna/intern/rna_userdef.c | |
| parent | afaca68ea86edd921f40cf45c245eaf8b5fc053a (diff) | |
| parent | 87608e66e174068f9471619a5fe153fd279c4947 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna/intern/rna_userdef.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_userdef.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 755ba31c77a..1ae946fda9e 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -395,15 +395,17 @@ static void rna_userdef_autosave_update(Main *bmain, Scene *scene, PointerRNA *p static bAddon *rna_userdef_addon_new(void) { + ListBase *addons_list = &U.addons; bAddon *bext = MEM_callocN(sizeof(bAddon), "bAddon"); - BLI_addtail(&U.addons, bext); + BLI_addtail(addons_list, bext); return bext; } -static void rna_userdef_addon_remove(ReportList *reports, PointerRNA *path_cmp_ptr) +static void rna_userdef_addon_remove(ReportList *reports, PointerRNA *bext_ptr) { - bAddon *bext = path_cmp_ptr->data; - if (BLI_findindex(&U.addons, bext) == -1) { + ListBase *addons_list = &U.addons; + bAddon *bext = bext_ptr->data; + if (BLI_findindex(addons_list, bext) == -1) { BKE_report(reports, RPT_ERROR, "Add-on is no longer valid"); return; } @@ -413,8 +415,8 @@ static void rna_userdef_addon_remove(ReportList *reports, PointerRNA *path_cmp_p MEM_freeN(bext->prop); } - BLI_freelinkN(&U.addons, bext); - RNA_POINTER_INVALIDATE(path_cmp_ptr); + BLI_freelinkN(addons_list, bext); + RNA_POINTER_INVALIDATE(bext_ptr); } static bPathCompare *rna_userdef_pathcompare_new(void) |