From 0de5156a24845867bb0d7dd618f5d00b6efd424b Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Mon, 9 Mar 2020 11:17:37 +0100 Subject: Cleanup: WindowManager: Move to IDTypeInfo and remove unused WM API. Getting rid of one static 'registered' callback in BKE, yeah! --- source/blender/blenkernel/intern/idtype.c | 2 +- source/blender/blenkernel/intern/lib_id_delete.c | 4 +--- source/blender/blenkernel/intern/lib_intern.h | 2 -- source/blender/blenkernel/intern/lib_remap.c | 7 ------- 4 files changed, 2 insertions(+), 13 deletions(-) (limited to 'source/blender/blenkernel/intern') diff --git a/source/blender/blenkernel/intern/idtype.c b/source/blender/blenkernel/intern/idtype.c index e2c52520e47..a7274fbc23d 100644 --- a/source/blender/blenkernel/intern/idtype.c +++ b/source/blender/blenkernel/intern/idtype.c @@ -78,7 +78,7 @@ static void id_type_init(void) INIT_TYPE(ID_BR); // INIT_TYPE(ID_PA); // INIT_TYPE(ID_GD); - // INIT_TYPE(ID_WM); + INIT_TYPE(ID_WM); // INIT_TYPE(ID_MC); // INIT_TYPE(ID_MSK); // INIT_TYPE(ID_LS); diff --git a/source/blender/blenkernel/intern/lib_id_delete.c b/source/blender/blenkernel/intern/lib_id_delete.c index c36c5afa1cf..6a017d5a8d7 100644 --- a/source/blender/blenkernel/intern/lib_id_delete.c +++ b/source/blender/blenkernel/intern/lib_id_delete.c @@ -217,9 +217,7 @@ void BKE_libblock_free_datablock(ID *id, const int UNUSED(flag)) BKE_particlesettings_free((ParticleSettings *)id); break; case ID_WM: - if (free_windowmanager_cb) { - free_windowmanager_cb(NULL, (wmWindowManager *)id); - } + BLI_assert(0); break; case ID_GD: BKE_gpencil_free((bGPdata *)id, true); diff --git a/source/blender/blenkernel/intern/lib_intern.h b/source/blender/blenkernel/intern/lib_intern.h index bd5e4a8dfe2..9cc5db64d17 100644 --- a/source/blender/blenkernel/intern/lib_intern.h +++ b/source/blender/blenkernel/intern/lib_intern.h @@ -24,8 +24,6 @@ #ifndef __LIB_INTERN_H__ #define __LIB_INTERN_H__ -extern BKE_library_free_window_manager_cb free_windowmanager_cb; - extern BKE_library_free_notifier_reference_cb free_notifier_reference_cb; extern BKE_library_remap_editor_id_reference_cb remap_editor_id_reference_cb; diff --git a/source/blender/blenkernel/intern/lib_remap.c b/source/blender/blenkernel/intern/lib_remap.c index d8b32b6e04c..d4b7696074a 100644 --- a/source/blender/blenkernel/intern/lib_remap.c +++ b/source/blender/blenkernel/intern/lib_remap.c @@ -48,13 +48,6 @@ static CLG_LogRef LOG = {.identifier = "bke.lib_remap"}; -BKE_library_free_window_manager_cb free_windowmanager_cb = NULL; - -void BKE_library_callback_free_window_manager_set(BKE_library_free_window_manager_cb func) -{ - free_windowmanager_cb = func; -} - BKE_library_free_notifier_reference_cb free_notifier_reference_cb = NULL; void BKE_library_callback_free_notifier_reference_set(BKE_library_free_notifier_reference_cb func) -- cgit v1.2.3