diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-05-04 05:40:38 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-05-04 09:01:20 +0300 |
| commit | 8d5e57748a777a76dbbe85d432d7d8364775713a (patch) | |
| tree | 365745db752fc34fb4d0544913eacd3a0801e0ff /source/blender/windowmanager | |
| parent | da8a62adcedecf1a7f7f21f47c2ad8153649b423 (diff) | |
Cleanup: WM_main_remove_notifier_reference
Assumed the `reference` pointer is an ID, currently true, but may not always be.
Add a callback specifically for this purpose since cleaning up notifiers and space-types are different operations.
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/WM_api.h | 1 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 9 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_init_exit.c | 1 |
3 files changed, 9 insertions, 2 deletions
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h index dbeea80ba82..d4148a56dd2 100644 --- a/source/blender/windowmanager/WM_api.h +++ b/source/blender/windowmanager/WM_api.h @@ -175,6 +175,7 @@ bool WM_modal_tweak_exit(const struct wmEvent *event, int tweak_event); void WM_event_add_notifier(const struct bContext *C, unsigned int type, void *reference); void WM_main_add_notifier(unsigned int type, void *reference); void WM_main_remove_notifier_reference(const void *reference); +void WM_main_remove_editor_id_reference(const struct ID *id); /* reports */ void WM_report(const struct bContext *C, ReportType type, const char *message); diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index c883b37f6c5..f054c5a43c1 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -218,7 +218,6 @@ void WM_main_remove_notifier_reference(const void *reference) { Main *bmain = G.main; wmWindowManager *wm = bmain->wm.first; - bScreen *sc; if (wm) { wmNotifier *note, *note_next; @@ -233,6 +232,12 @@ void WM_main_remove_notifier_reference(const void *reference) } } } +} + +void WM_main_remove_editor_id_reference(const ID *id) +{ + Main *bmain = G.main; + bScreen *sc; for (sc = bmain->screen.first; sc; sc = sc->id.next) { ScrArea *sa; @@ -244,7 +249,7 @@ void WM_main_remove_notifier_reference(const void *reference) if (sl->spacetype == SPACE_OUTLINER) { SpaceOops *so = (SpaceOops *)sl; - ED_outliner_id_unref(so, (ID *)reference); + ED_outliner_id_unref(so, id); } } } diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index add09aa4c1f..7ca82c0c03a 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -151,6 +151,7 @@ void WM_init(bContext *C, int argc, const char **argv) BKE_library_callback_free_window_manager_set(wm_close_and_free); /* library.c */ BKE_library_callback_free_notifier_reference_set(WM_main_remove_notifier_reference); /* library.c */ + BKE_library_callback_free_editor_id_reference_set(WM_main_remove_editor_id_reference); /* library.c */ BKE_blender_callback_test_break_set(wm_window_testbreak); /* blender.c */ DAG_editors_update_cb(ED_render_id_flush_update, ED_render_scene_update); /* depsgraph.c */ |