griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton
2018-01-31 19:03:45 +11:00
parent afaca68ea8 87608e66e1
commit 6d55b522fe
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/makesdna/DNA_userdef_types.h
View File

@@ -412,7 +412,6 @@ typedef struct bTheme {
#define UI_THEMESPACE_START(btheme) (CHECK_TYPE_INLINE(btheme, bTheme *), &((btheme)->tbuts))
#define UI_THEMESPACE_END(btheme) (CHECK_TYPE_INLINE(btheme, bTheme *), (&((btheme)->tclip) + 1))
/* for the moment only the name. may want to store options with this later */
typedef struct bAddon {
struct bAddon *next, *prev;
char module[64];

14
source/blender/makesrna/intern/rna_userdef.c
View File

@@ -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)