diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-05-22 07:28:10 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-05-22 07:28:10 +0300 |
commit | b79ff12e11ebac06317d4e10df34318d415d4dc7 (patch) | |
tree | d9d595c023bcb0affc0703269aa7503c44722319 /source/blender/windowmanager/intern/wm_files.c | |
parent | fc0312f538acc6411965cb664f8a5744d274e188 (diff) |
Preferences: add handler for loading factory preferences
Allows app-templates to define their own adjustments to preferences.
This matches `load_factory_startup_post`, use when loading preferences.
Diffstat (limited to 'source/blender/windowmanager/intern/wm_files.c')
-rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index 529492470f7..097db49aea6 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -491,7 +491,7 @@ static void wm_file_read_post(bContext *C, const bool is_startup_file, const bool is_factory_startup, const bool use_data, - const bool UNUSED(use_userdef), + const bool use_userdef, const bool reset_app_template) { bool addons_loaded = false; @@ -537,15 +537,23 @@ static void wm_file_read_post(bContext *C, Main *bmain = CTX_data_main(C); - if (use_data) { - WM_operatortype_last_properties_clear_all(); + if (use_userdef) { + if (is_factory_startup) { + BLI_callback_exec(bmain, NULL, BLI_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); if (is_factory_startup) { BLI_callback_exec(bmain, NULL, BLI_CB_EVT_LOAD_FACTORY_STARTUP_POST); } + } + + if (use_data) { + WM_operatortype_last_properties_clear_all(); /* After load post, so for example the driver namespace can be filled * before evaluating the depsgraph. */ |