diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-02-22 07:10:43 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-22 07:10:43 +0300 |
| commit | 648df0fcdb8249d8d00ee501d6947216bb7330d5 (patch) | |
| tree | 4356a8ac020cea06bf13a695e0b4309acaab448a /source/blender/windowmanager | |
| parent | 257cf86a05517fd66d65f55c95fc28ec945804a8 (diff) | |
Revert "BKE: Changing ID freeing order."
This reverts commit 87c72a7d2714de286109573055d5d5da32ece91e.
Caused T54121 which breaks blend file saving.
For now crash on exit is preferable.
Possible solution is to free screen-manipulator batches in a separate
loop.
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_init_exit.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index 8465ec1c608..adb03de4612 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -521,17 +521,6 @@ void WM_exit_ext(bContext *C, const bool do_python) COM_deinitialize(); #endif - if (!G.background) { -#ifdef WITH_OPENSUBDIV - BKE_subsurf_osd_cleanup(); -#endif - - GPU_global_buffer_pool_free(); - GPU_free_unused_buffers(); - - GPU_exit(); - } - BKE_blender_free(); /* blender.c, does entire library and spacetypes */ // free_matcopybuf(); ANIM_fcurves_copybuf_free(); @@ -576,6 +565,17 @@ void WM_exit_ext(bContext *C, const bool do_python) (void)do_python; #endif + if (!G.background) { +#ifdef WITH_OPENSUBDIV + BKE_subsurf_osd_cleanup(); +#endif + + GPU_global_buffer_pool_free(); + GPU_free_unused_buffers(); + + GPU_exit(); + } + BKE_undo_reset(); ED_file_exit(); /* for fsmenu */ |