[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57967] trunk/blender/source/blender/ windowmanager/intern/wm_keymap.c: Fix #35933: setting shortcut keys in object mode menu didn't work correct.

[Brecht Van Lommel]

Revision: 57967
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57967
Author:   blendix
Date:     2013-07-03 17:11:33 +0000 (Wed, 03 Jul 2013)
Log Message:
-----------
Fix #35933: setting shortcut keys in object mode menu didn't work correct.

Modified Paths:
--------------
    trunk/blender/source/blender/windowmanager/intern/wm_keymap.c

Modified: trunk/blender/source/blender/windowmanager/intern/wm_keymap.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_keymap.c	2013-07-03 17:02:09 UTC (rev 57966)
+++ trunk/blender/source/blender/windowmanager/intern/wm_keymap.c	2013-07-03 17:11:33 UTC (rev 57967)
@@ -1297,7 +1297,11 @@
 		km = WM_keymap_find_all(C, "3D View", sl->spacetype, 0);
 	}
 	else if (strstr(opname, "OBJECT_OT")) {
-		km = WM_keymap_find_all(C, "Object Mode", 0, 0);
+		/* exception, this needs to work outside object mode too */
+		if (strstr(opname, "OBJECT_OT_mode_set"))
+			km = WM_keymap_find_all(C, "Object Non-modal", 0, 0);
+		else
+			km = WM_keymap_find_all(C, "Object Mode", 0, 0);
 	}