[Bf-blender-cvs] [87c72a7d271] blender2.8: BKE: Changing ID freeing order.
Clément Foucault
noreply at git.blender.org
Wed Feb 21 22:52:31 CET 2018
Commit: 87c72a7d2714de286109573055d5d5da32ece91e
Author: Clément Foucault
Date: Wed Feb 21 22:51:35 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB87c72a7d2714de286109573055d5d5da32ece91e
BKE: Changing ID freeing order.
Screen can contains manipulators that contains batches to be freed before the opengl contexts (in WM) are destroyed.
Also fix other GPU related free.
===================================================================
M source/blender/blenkernel/intern/library.c
M source/blender/makesdna/DNA_ID.h
M source/blender/windowmanager/intern/wm_init_exit.c
===================================================================
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index e0608efece2..6169263b7cf 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -1067,6 +1067,8 @@ int set_listbasepointers(Main *main, ListBase **lb)
* This is important because freeing data decreases usercounts of other datablocks,
* if this data is its self freed it can crash. */
lb[INDEX_ID_LI] = &(main->library); /* Libraries may be accessed from pretty much any other ID... */
+ lb[INDEX_ID_WS] = &(main->workspaces); /* before wm, so it's freed after it! */
+ lb[INDEX_ID_WM] = &(main->wm);
lb[INDEX_ID_IP] = &(main->ipo);
lb[INDEX_ID_AC] = &(main->action); /* moved here to avoid problems when freeing with animato (aligorith) */
lb[INDEX_ID_KE] = &(main->key);
@@ -1108,8 +1110,6 @@ int set_listbasepointers(Main *main, ListBase **lb)
lb[INDEX_ID_OB] = &(main->object);
lb[INDEX_ID_LS] = &(main->linestyle); /* referenced by scenes */
lb[INDEX_ID_SCE] = &(main->scene);
- lb[INDEX_ID_WS] = &(main->workspaces); /* before wm, so it's freed after it! */
- lb[INDEX_ID_WM] = &(main->wm);
lb[INDEX_ID_MSK] = &(main->mask);
lb[INDEX_ID_NULL] = NULL;
diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h
index fd8cd8b2855..ffa09a21944 100644
--- a/source/blender/makesdna/DNA_ID.h
+++ b/source/blender/makesdna/DNA_ID.h
@@ -519,6 +519,8 @@ enum {
* keep them in sync! */
enum {
INDEX_ID_LI = 0,
+ INDEX_ID_WS,
+ INDEX_ID_WM,
INDEX_ID_IP,
INDEX_ID_AC,
INDEX_ID_KE,
@@ -551,8 +553,6 @@ enum {
INDEX_ID_OB,
INDEX_ID_LS,
INDEX_ID_SCE,
- INDEX_ID_WS,
- INDEX_ID_WM,
INDEX_ID_MSK,
INDEX_ID_NULL,
};
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c
index adb03de4612..8465ec1c608 100644
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@ -521,6 +521,17 @@ 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();
@@ -565,17 +576,6 @@ 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 */
More information about the Bf-blender-cvs
mailing list