diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-09-05 16:52:38 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-09-09 15:26:42 +0300 |
commit | 322c03f13cb5a756902f310c2a34cf78825fe02d (patch) | |
tree | c57f59635742304b7e6f6f0d0f28c3a01f2c2d2a /source/blender/windowmanager | |
parent | 103d29e2b2c0053436d0cef649ee9c6a24b2cba8 (diff) |
Move callbacks API from BLI to BKE
Preparing for the bigger changes which will be related on passing
dependency graph to various callbacks which need it.
Differential Revision: https://developer.blender.org/D5725
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 22 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_init_exit.c | 8 |
2 files changed, 15 insertions, 15 deletions
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index e70640d2f22..ae5235c7f58 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -54,7 +54,6 @@ #include "BLI_utildefines.h" #include "BLI_timer.h" #include "BLI_threads.h" -#include "BLI_callbacks.h" #include "BLI_system.h" #include BLI_SYSTEM_PID_H @@ -75,6 +74,7 @@ #include "BKE_blender.h" #include "BKE_blendfile.h" #include "BKE_blender_undo.h" +#include "BKE_callbacks.h" #include "BKE_context.h" #include "BKE_global.h" #include "BKE_idprop.h" @@ -537,16 +537,16 @@ static void wm_file_read_post(bContext *C, if (use_userdef) { if (is_factory_startup) { - BLI_callback_exec(bmain, NULL, BLI_CB_EVT_LOAD_FACTORY_USERDEF_POST); + BKE_callback_exec(bmain, NULL, BKE_CB_EVT_LOAD_FACTORY_USERDEF_POST); } } if (use_data) { /* important to do before NULL'ing the context */ - BLI_callback_exec(bmain, NULL, BLI_CB_EVT_VERSION_UPDATE); - BLI_callback_exec(bmain, NULL, BLI_CB_EVT_LOAD_POST); + BKE_callback_exec(bmain, NULL, BKE_CB_EVT_VERSION_UPDATE); + BKE_callback_exec(bmain, NULL, BKE_CB_EVT_LOAD_POST); if (is_factory_startup) { - BLI_callback_exec(bmain, NULL, BLI_CB_EVT_LOAD_FACTORY_STARTUP_POST); + BKE_callback_exec(bmain, NULL, BKE_CB_EVT_LOAD_FACTORY_STARTUP_POST); } } @@ -609,7 +609,7 @@ bool WM_file_read(bContext *C, const char *filepath, ReportList *reports) WM_cursor_wait(1); - BLI_callback_exec(CTX_data_main(C), NULL, BLI_CB_EVT_LOAD_PRE); + BKE_callback_exec(CTX_data_main(C), NULL, BKE_CB_EVT_LOAD_PRE); BLI_timer_on_file_load(); UI_view2d_zoom_cache_reset(); @@ -807,7 +807,7 @@ void wm_homefile_read(bContext *C, } if (use_data) { - BLI_callback_exec(CTX_data_main(C), NULL, BLI_CB_EVT_LOAD_PRE); + BKE_callback_exec(CTX_data_main(C), NULL, BKE_CB_EVT_LOAD_PRE); BLI_timer_on_file_load(); G.relbase_valid = 0; @@ -1368,7 +1368,7 @@ static bool wm_file_write(bContext *C, const char *filepath, int fileflags, Repo /* Call pre-save callbacks before writing preview, * that way you can generate custom file thumbnail. */ - BLI_callback_exec(bmain, NULL, BLI_CB_EVT_SAVE_PRE); + BKE_callback_exec(bmain, NULL, BKE_CB_EVT_SAVE_PRE); /* Enforce full override check/generation on file save. */ BKE_main_override_library_operations_create(bmain, true); @@ -1421,7 +1421,7 @@ static bool wm_file_write(bContext *C, const char *filepath, int fileflags, Repo wm_history_file_update(); } - BLI_callback_exec(bmain, NULL, BLI_CB_EVT_SAVE_POST); + BKE_callback_exec(bmain, NULL, BKE_CB_EVT_SAVE_POST); /* run this function after because the file cant be written before the blend is */ if (ibuf_thumb) { @@ -1646,7 +1646,7 @@ static int wm_homefile_write_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; } - BLI_callback_exec(bmain, NULL, BLI_CB_EVT_SAVE_PRE); + BKE_callback_exec(bmain, NULL, BKE_CB_EVT_SAVE_PRE); /* check current window and close it if temp */ if (win && WM_window_is_temp_screen(win)) { @@ -1674,7 +1674,7 @@ static int wm_homefile_write_exec(bContext *C, wmOperator *op) G.save_over = 0; - BLI_callback_exec(bmain, NULL, BLI_CB_EVT_SAVE_POST); + BKE_callback_exec(bmain, NULL, BKE_CB_EVT_SAVE_POST); return OPERATOR_FINISHED; } diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index 1e3c8a0aedd..736a3315efa 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -41,7 +41,6 @@ #include "DNA_userdef_types.h" #include "DNA_windowmanager_types.h" -#include "BLI_callbacks.h" #include "BLI_listbase.h" #include "BLI_path_util.h" #include "BLI_string.h" @@ -55,6 +54,7 @@ #include "BKE_blendfile.h" #include "BKE_blender.h" #include "BKE_blender_undo.h" +#include "BKE_callbacks.h" #include "BKE_context.h" #include "BKE_font.h" #include "BKE_global.h" @@ -378,10 +378,10 @@ void WM_init(bContext *C, int argc, const char **argv) * note that recovering the last session does its own callbacks. */ CTX_wm_window_set(C, CTX_wm_manager(C)->windows.first); - BLI_callback_exec(bmain, NULL, BLI_CB_EVT_VERSION_UPDATE); - BLI_callback_exec(bmain, NULL, BLI_CB_EVT_LOAD_POST); + BKE_callback_exec(bmain, NULL, BKE_CB_EVT_VERSION_UPDATE); + BKE_callback_exec(bmain, NULL, BKE_CB_EVT_LOAD_POST); if (is_factory_startup) { - BLI_callback_exec(bmain, NULL, BLI_CB_EVT_LOAD_FACTORY_STARTUP_POST); + BKE_callback_exec(bmain, NULL, BKE_CB_EVT_LOAD_FACTORY_STARTUP_POST); } wm_file_read_report(C, bmain); |