diff options
author | Julian Eisel <eiseljulian@gmail.com> | 2015-08-01 14:01:30 +0300 |
---|---|---|
committer | Julian Eisel <eiseljulian@gmail.com> | 2015-08-01 14:01:30 +0300 |
commit | fa1945c9e52e7afea9db20447335b9b4e108de2f (patch) | |
tree | 028fd481fc39b40a71a3f232234a350154970576 | |
parent | 2904007d316641d5abba18727ab5437b5af87e73 (diff) |
Allow accessing modal keymap strings directly from keymap
Previously you had to pass operator which in some cases might not be available or hard to get.
-rw-r--r-- | source/blender/windowmanager/WM_keymap.h | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_keymap.c | 11 |
2 files changed, 10 insertions, 3 deletions
diff --git a/source/blender/windowmanager/WM_keymap.h b/source/blender/windowmanager/WM_keymap.h index cd42f36d363..28a8340cd92 100644 --- a/source/blender/windowmanager/WM_keymap.h +++ b/source/blender/windowmanager/WM_keymap.h @@ -82,6 +82,8 @@ int WM_keymap_item_compare(struct wmKeyMapItem *k1, struct wmKeyMapItem *k2); /* Modal Keymap */ +int WM_modalkeymap_items_to_string( + struct wmKeyMap *km, const int propvalue, const bool compact, const int len, char *r_str); int WM_modalkeymap_operator_items_to_string( struct wmOperatorType *ot, const int propvalue, const bool compact, const int len, char *r_str); char *WM_modalkeymap_operator_items_to_string_buf( diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c index e65ce4791e8..17cb84bf8ef 100644 --- a/source/blender/windowmanager/intern/wm_keymap.c +++ b/source/blender/windowmanager/intern/wm_keymap.c @@ -975,10 +975,9 @@ int WM_keymap_item_to_string(wmKeyMapItem *kmi, const bool compact, const int le compact, len, r_str); } -int WM_modalkeymap_operator_items_to_string( - wmOperatorType *ot, const int propvalue, const bool compact, const int len, char *r_str) +int WM_modalkeymap_items_to_string( + wmKeyMap *km, const int propvalue, const bool compact, const int len, char *r_str) { - wmKeyMap *km = ot->modalkeymap; int totlen = 0; bool add_sep = false; @@ -1004,6 +1003,12 @@ int WM_modalkeymap_operator_items_to_string( return totlen; } +int WM_modalkeymap_operator_items_to_string( + wmOperatorType *ot, const int propvalue, const bool compact, const int len, char *r_str) +{ + return WM_modalkeymap_items_to_string(ot->modalkeymap, propvalue, compact, len, r_str); +} + char *WM_modalkeymap_operator_items_to_string_buf( wmOperatorType *ot, const int propvalue, const bool compact, const int max_len, int *r_available_len, char **r_str) |