[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57195] trunk/blender: tweak to recent commit, don't show keymap in menu tooltips.

[Campbell Barton]

Revision: 57195
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57195
Author:   campbellbarton
Date:     2013-06-02 15:58:43 +0000 (Sun, 02 Jun 2013)
Log Message:
-----------
tweak to recent commit, don't show keymap in menu tooltips.

Modified Paths:
--------------
    trunk/blender/intern/guardedalloc/intern/mallocn.c
    trunk/blender/source/blender/editors/interface/interface.c

Modified: trunk/blender/intern/guardedalloc/intern/mallocn.c
===================================================================
--- trunk/blender/intern/guardedalloc/intern/mallocn.c	2013-06-02 15:51:47 UTC (rev 57194)
+++ trunk/blender/intern/guardedalloc/intern/mallocn.c	2013-06-02 15:58:43 UTC (rev 57195)
@@ -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: */

Modified: trunk/blender/source/blender/editors/interface/interface.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface.c	2013-06-02 15:51:47 UTC (rev 57194)
+++ trunk/blender/source/blender/editors/interface/interface.c	2013-06-02 15:58:43 UTC (rev 57195)
@@ -4091,9 +4091,11 @@
 			}
 		}
 		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);
+				}
 			}
 		}