diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-06-02 19:58:43 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-06-02 19:58:43 +0400 |
| commit | 7068a5eba7e0dfdbd332f73f1c20a2be72695b47 (patch) | |
| tree | 60ca3ff3b6b43ca8742c0fd5a4d2729fb3f44287 /source/blender | |
| parent | 732c566f2fb5253c152b81ebbe76eb6a17862046 (diff) | |
tweak to recent commit, don't show keymap in menu tooltips.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/editors/interface/interface.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index 737dd9accb2..cce9ec50c1e 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -4091,9 +4091,11 @@ void uiButGetStrInfo(bContext *C, uiBut *but, ...) } } else if (type == BUT_GET_OP_KEYMAP) { - char buf[128]; - if (ui_but_event_operator_string(C, but, buf, sizeof(buf))) { - tmp = BLI_strdup(buf); + if (!ui_block_is_menu(but->block)) { + char buf[128]; + if (ui_but_event_operator_string(C, but, buf, sizeof(buf))) { + tmp = BLI_strdup(buf); + } } } |