diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-11-13 21:02:12 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-11-13 21:29:13 +0300 |
| commit | ca6dd692b5b0137d236f14ed306196662f0cd869 (patch) | |
| tree | 579ae2480246e89572365a8ef0662f33a9bb06c2 /source/blender/windowmanager/intern/wm.c | |
| parent | c39d5a6c88dcda9dff9626d7b059a98913da6fd2 (diff) | |
Keymaps: reload key configuration when changing select mouse.
For configuration scripts that want to change keymaps based on this setting.
Diffstat (limited to 'source/blender/windowmanager/intern/wm.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/source/blender/windowmanager/intern/wm.c b/source/blender/windowmanager/intern/wm.c index bc9c1e263cb..29a1252cf4b 100644 --- a/source/blender/windowmanager/intern/wm.c +++ b/source/blender/windowmanager/intern/wm.c @@ -225,7 +225,16 @@ void WM_operator_handlers_clear(wmWindowManager *wm, wmOperatorType *ot) /* ****************************************** */ -void WM_keymap_init(bContext *C) +void WM_keyconfig_reload(bContext *C) +{ + if (CTX_py_init_get(C) && !G.background) { + BPY_execute_string( + C, (const char *[]){"bpy", NULL}, + "bpy.utils.keyconfig_init()"); + } +} + +void WM_keyconfig_init(bContext *C) { wmWindowManager *wm = CTX_wm_manager(C); @@ -239,16 +248,14 @@ void WM_keymap_init(bContext *C) /* initialize only after python init is done, for keymaps that * use python operators */ - if (CTX_py_init_get(C) && (wm->initialized & WM_KEYMAP_IS_INITIALIZED) == 0) { + if (CTX_py_init_get(C) && (wm->initialized & WM_KEYCONFIG_IS_INITIALIZED) == 0) { /* create default key config, only initialize once, * it's persistent across sessions */ if (!(wm->defaultconf->flag & KEYCONF_INIT_DEFAULT)) { wm_window_keymap(wm->defaultconf); ED_spacetypes_keymap(wm->defaultconf); - BPY_execute_string( - C, (const char *[]){"bpy", NULL}, - "bpy.utils.keyconfig_init()"); + WM_keyconfig_reload(C); wm->defaultconf->flag |= KEYCONF_INIT_DEFAULT; } @@ -256,7 +263,7 @@ void WM_keymap_init(bContext *C) WM_keyconfig_update_tag(NULL, NULL); WM_keyconfig_update(wm); - wm->initialized |= WM_KEYMAP_IS_INITIALIZED; + wm->initialized |= WM_KEYCONFIG_IS_INITIALIZED; } } @@ -278,7 +285,7 @@ void WM_check(bContext *C) if (!G.background) { /* case: fileread */ if ((wm->initialized & WM_WINDOW_IS_INITIALIZED) == 0) { - WM_keymap_init(C); + WM_keyconfig_init(C); WM_autosave_init(wm); } |