bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton 2018-07-06 07:56:08 +02:00
commit 5b3545f99f
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenkernel/BKE_addon.h
View File

@ -53,6 +53,7 @@ void BKE_addon_pref_type_free(void);
struct bAddon *BKE_addon_new(void);
struct bAddon *BKE_addon_find(struct ListBase *addon_list, const char *module);
struct bAddon *BKE_addon_ensure(struct ListBase *addon_list, const char *module);
bool BKE_addon_remove_safe(struct ListBase *addon_list, const char *module);
void BKE_addon_free(struct bAddon *addon);
#endif /* __BKE_ADDON_H__ */

11
source/blender/blenkernel/intern/addon.c
View File

@ -69,6 +69,17 @@ bAddon *BKE_addon_ensure(ListBase *addon_list, const char *module)
return addon;
}
bool BKE_addon_remove_safe(ListBase *addon_list, const char *module)
{
bAddon *addon = BLI_findstring(addon_list, module, offsetof(bAddon, module));
if (addon) {
BLI_remlink(addon_list, addon);
BKE_addon_free(addon);
return true;
}
return false;
}
void BKE_addon_free(bAddon *addon)
{
if (addon->prop) {

6
source/blender/editors/interface/resources.c
View File

@ -1610,11 +1610,7 @@ void init_userdef_do_versions(Main *bmain)
/* Not versioning, just avoid errors. */
#ifndef WITH_CYCLES
bAddon *addon = BLI_findstring(&U.addons, "cycles", offsetof(bAddon, module));
if (addon) {
BLI_remlink(&U.addons, addon);
BKE_addon_free(addon);
}
BKE_addon_remove_safe(&U.addons, "cycles");
#endif
/* funny name, but it is GE stuff, moves userdef stuff to engine */