archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

tweak to recent commit, don't show keymap in menu tooltips.

Browse Source
This commit is contained in:
Campbell Barton
2013-06-02 15:58:43 +00:00
parent 732c566f2f
commit 7068a5eba7
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/guardedalloc/intern/mallocn.c
View File

@@ -50,7 +50,7 @@
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
/* should always be defined except for experemental cases */ /* should always be defined except for experimental cases */
#ifdef WITH_GUARDEDALLOC #ifdef WITH_GUARDEDALLOC
/* Blame Microsoft for LLP64 and no inttypes.h, quick workaround needed: */ /* Blame Microsoft for LLP64 and no inttypes.h, quick workaround needed: */

2
source/blender/editors/interface/interface.c
View File

@@ -4091,11 +4091,13 @@ void uiButGetStrInfo(bContext *C, uiBut *but, ...)
} }
} }
else if (type == BUT_GET_OP_KEYMAP) { else if (type == BUT_GET_OP_KEYMAP) {
if (!ui_block_is_menu(but->block)) {
char buf[128]; char buf[128];
if (ui_but_event_operator_string(C, but, buf, sizeof(buf))) { if (ui_but_event_operator_string(C, but, buf, sizeof(buf))) {
tmp = BLI_strdup(buf); tmp = BLI_strdup(buf);
} }
} }
}
si->strinfo = tmp; si->strinfo = tmp;
} }