From 1caa5b14bfe84ede512d40e45217d109a5997782 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 8 Mar 2019 02:15:24 +0100 Subject: Cleanup: remove unused test break code for handling cancels. --- source/blender/blenkernel/BKE_blender.h | 4 ---- source/blender/blenkernel/intern/blender.c | 21 ----------------- source/blender/windowmanager/intern/wm_init_exit.c | 1 - source/blender/windowmanager/intern/wm_window.c | 27 ---------------------- source/blender/windowmanager/wm_window.h | 3 --- 5 files changed, 56 deletions(-) (limited to 'source/blender') diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h index 6659bcc649b..1becd3ed086 100644 --- a/source/blender/blenkernel/BKE_blender.h +++ b/source/blender/blenkernel/BKE_blender.h @@ -48,10 +48,6 @@ void BKE_blender_userdef_app_template_data_set_and_free(struct UserDef *userdef) void BKE_blender_userdef_data_free(struct UserDef *userdef, bool clear_fonts); -/* set this callback when a UI is running */ -void BKE_blender_callback_test_break_set(void (*func)(void)); -int BKE_blender_test_break(void); - /* Blenders' own atexit (avoids leaking) */ void BKE_blender_atexit_register(void (*func)(void *user_data), void *user_data); void BKE_blender_atexit_unregister(void (*func)(void *user_data), const void *user_data); diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c index a5c80ab05a0..08d49dee754 100644 --- a/source/blender/blenkernel/intern/blender.c +++ b/source/blender/blenkernel/intern/blender.c @@ -325,27 +325,6 @@ void BKE_blender_userdef_app_template_data_set_and_free(UserDef *userdef) MEM_freeN(userdef); } -/* ***************** testing for break ************* */ - -static void (*blender_test_break_cb)(void) = NULL; - -void BKE_blender_callback_test_break_set(void (*func)(void)) -{ - blender_test_break_cb = func; -} - - -int BKE_blender_test_break(void) -{ - if (!G.background) { - if (blender_test_break_cb) - blender_test_break_cb(); - } - - return (G.is_break == true); -} - - /** \name Blender's AtExit * * \note Don't use MEM_mallocN so functions can be registered at any time. diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index 5990308ee44..946e7c4a856 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -224,7 +224,6 @@ void WM_init(bContext *C, int argc, const char **argv) BKE_region_callback_free_gizmomap_set(wm_gizmomap_remove); /* screen.c */ BKE_region_callback_refresh_tag_gizmomap_set(WM_gizmomap_tag_refresh); BKE_library_callback_remap_editor_id_reference_set(WM_main_remap_editor_id_reference); /* library.c */ - BKE_blender_callback_test_break_set(wm_window_testbreak); /* blender.c */ BKE_spacedata_callback_id_remap_set(ED_spacedata_id_remap); /* screen.c */ DEG_editors_set_update_cb(ED_render_id_flush_update, ED_render_scene_update); diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index 613f5c58f85..ae9d4467112 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -1664,33 +1664,6 @@ void wm_window_process_events(const bContext *C) PIL_sleep_ms(5); } -void wm_window_process_events_nosleep(void) -{ - if (GHOST_ProcessEvents(g_system, 0)) - GHOST_DispatchEvents(g_system); -} - -/* exported as handle callback to bke blender.c */ -void wm_window_testbreak(void) -{ - static double ltime = 0; - double curtime = PIL_check_seconds_timer(); - - BLI_assert(BLI_thread_is_main()); - - /* only check for breaks every 50 milliseconds - * if we get called more often. - */ - if ((curtime - ltime) > 0.05) { - int hasevent = GHOST_ProcessEvents(g_system, 0); /* 0 is no wait */ - - if (hasevent) - GHOST_DispatchEvents(g_system); - - ltime = curtime; - } -} - /* **************** init ********************** */ /* bContext can be null in background mode because we don't diff --git a/source/blender/windowmanager/wm_window.h b/source/blender/windowmanager/wm_window.h index 248696a22d6..9e7eb213070 100644 --- a/source/blender/windowmanager/wm_window.h +++ b/source/blender/windowmanager/wm_window.h @@ -48,7 +48,6 @@ void wm_window_title (wmWindowManager *wm, wmWindow *win); void wm_window_ghostwindows_ensure(wmWindowManager *wm); void wm_window_ghostwindows_remove_invalid(bContext *C, wmWindowManager *wm); void wm_window_process_events (const bContext *C); -void wm_window_process_events_nosleep(void); void wm_window_clear_drawable(wmWindowManager *wm); void wm_window_make_drawable(wmWindowManager *wm, wmWindow *win); @@ -66,8 +65,6 @@ void wm_get_cursor_position (wmWindow *win, int *x, int *y); void wm_cursor_position_from_ghost (wmWindow *win, int *x, int *y); void wm_cursor_position_to_ghost (wmWindow *win, int *x, int *y); -void wm_window_testbreak (void); - #ifdef WITH_INPUT_IME void wm_window_IME_begin (wmWindow *win, int x, int y, int w, int h, bool complete); void wm_window_IME_end (wmWindow *win); -- cgit v1.2.3