diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-06-14 12:17:13 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-06-14 12:17:13 +0300 |
commit | 6656af2d11cd70739b9423275729d7acb240e554 (patch) | |
tree | 694fc7035e800f05e24a6fed28dc8c293dc247ea /source/blender/windowmanager/intern/wm.c | |
parent | 48cd25a11aeca7e9d899130171a9d9848e89cf26 (diff) | |
parent | 20e5052a72215fa432f7b74cd4b77a5fd8c8e7f1 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/windowmanager/intern/wm.c')
-rw-r--r-- | source/blender/windowmanager/intern/wm.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/windowmanager/intern/wm.c b/source/blender/windowmanager/intern/wm.c index af275394fcb..da1b5feea3d 100644 --- a/source/blender/windowmanager/intern/wm.c +++ b/source/blender/windowmanager/intern/wm.c @@ -485,13 +485,12 @@ void wm_close_and_free(bContext *C, wmWindowManager *wm) void wm_close_and_free_all(bContext *C, ListBase *wmlist) { - Main *bmain = CTX_data_main(C); wmWindowManager *wm; - + while ((wm = wmlist->first)) { wm_close_and_free(C, wm); BLI_remlink(wmlist, wm); - BKE_libblock_free_data(bmain, &wm->id, true); + BKE_libblock_free_data(&wm->id, true); MEM_freeN(wm); } } |