tweak to recent commit, don't show keymap in menu tooltips.
authorCampbell Barton <ideasman42@gmail.com>
Sun, 2 Jun 2013 15:58:43 +0000 (15:58 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 2 Jun 2013 15:58:43 +0000 (15:58 +0000)
intern/guardedalloc/intern/mallocn.c
source/blender/editors/interface/interface.c

index 4d31cade8569d0850c88cdb734a663fed58b740c..4a72089f8f7aae20d5c3c22b644bb1648178458f 100644 (file)
@@ -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: */
index 737dd9accb20a3bd48fe5679d77d488dbf440dca..cce9ec50c1e0c6386082f310aef29f66ec9b5549 100644 (file)
@@ -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);
+                               }
                        }
                }