diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-12 10:15:49 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-12 10:15:49 +0300 |
| commit | 99bb1accbbb8e1ba38f30b073b22deb107bf3220 (patch) | |
| tree | 7852ec686524e785486c452ec959713abbbef666 /source/blender/windowmanager/intern/wm_init_exit.c | |
| parent | 732cd96737007b1411a161369f842209a4c26419 (diff) | |
| parent | b8f217ef213f908a6b5407f162a8f980091e838d (diff) | |
Merge branch 'master' into asset-experiments
Conflicts:
source/blender/blenloader/intern/readfile.c
source/blender/windowmanager/intern/wm_init_exit.c
Diffstat (limited to 'source/blender/windowmanager/intern/wm_init_exit.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_init_exit.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index 4d5156f9ae5..1de92c09af1 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -43,6 +43,7 @@ #include "RNA_define.h" #include "RNA_types.h" +#include "DNA_genfile.h" #include "DNA_scene_types.h" #include "DNA_userdef_types.h" #include "DNA_windowmanager_types.h" @@ -588,6 +589,8 @@ void WM_exit_ext(bContext *C, const bool do_python) GHOST_DisposeSystemPaths(); + DNA_sdna_current_free(); + BLI_threadapi_exit(); BKE_blender_atexit(); |