From 7068a5eba7e0dfdbd332f73f1c20a2be72695b47 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 2 Jun 2013 15:58:43 +0000 Subject: [PATCH] tweak to recent commit, don't show keymap in menu tooltips. --- intern/guardedalloc/intern/mallocn.c | 2 +- source/blender/editors/interface/interface.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/intern/guardedalloc/intern/mallocn.c b/intern/guardedalloc/intern/mallocn.c index 4d31cade856..4a72089f8f7 100644 --- a/intern/guardedalloc/intern/mallocn.c +++ b/intern/guardedalloc/intern/mallocn.c @@ -50,7 +50,7 @@ #include "MEM_guardedalloc.h" -/* should always be defined except for experemental cases */ +/* should always be defined except for experimental cases */ #ifdef WITH_GUARDEDALLOC /* Blame Microsoft for LLP64 and no inttypes.h, quick workaround needed: */ 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); + } } }