diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-02-12 09:39:58 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-12 09:39:58 +0300 |
| commit | 2c3d4f7e654b416665b19cb60e8d2bf0d7cde5dd (patch) | |
| tree | ff5cfc343c62dbcedf8da2c0bb2fdf3cf082c297 /source/blender/blenkernel/intern/blender.c | |
| parent | 0bf615fc2464a06b3e40fc5936873b67ec6dd684 (diff) | |
| parent | 53431a560e51d106e78de00f7faef5bfccc8e933 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/blender.c')
| -rw-r--r-- | source/blender/blenkernel/intern/blender.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c index 182b88c1c57..e9a6d0fe5a5 100644 --- a/source/blender/blenkernel/intern/blender.c +++ b/source/blender/blenkernel/intern/blender.c @@ -45,6 +45,7 @@ #include "IMB_imbuf.h" #include "IMB_moviecache.h" +#include "BKE_addon.h" #include "BKE_blender.h" /* own include */ #include "BKE_blender_version.h" /* own include */ #include "BKE_blendfile.h" @@ -202,11 +203,7 @@ static void userdef_free_addons(UserDef *userdef) { for (bAddon *addon = userdef->addons.first, *addon_next; addon; addon = addon_next) { addon_next = addon->next; - if (addon->prop) { - IDP_FreeProperty(addon->prop); - MEM_freeN(addon->prop); - } - MEM_freeN(addon); + BKE_addon_free(addon); } BLI_listbase_clear(&userdef->addons); } |