[Bf-blender-cvs] [8e0cfcfc90c] blender2.8: Keymap: add back macos preferences shortcut

Campbell Barton noreply at git.blender.org
Mon Jul 2 15:16:59 CEST 2018


Commit: 8e0cfcfc90cecb241ab99dab99cd432a429a2551
Author: Campbell Barton
Date:   Mon Jul 2 15:14:49 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB8e0cfcfc90cecb241ab99dab99cd432a429a2551

Keymap: add back macos preferences shortcut

Would like to avoid OS-keys, but apparently this is expected on OSX.

===================================================================

M	source/blender/editors/screen/screen_ops.c

===================================================================

diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index e21f328ddf9..f449272bc72 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -4900,11 +4900,11 @@ void ED_keymap_screen(wmKeyConfig *keyconf)
 	WM_keymap_add_item(keymap, "RENDER_OT_view_show", F11KEY, KM_PRESS, 0, 0);
 	WM_keymap_add_item(keymap, "RENDER_OT_play_rendered_anim", F11KEY, KM_PRESS, KM_CTRL, 0);
 
-#ifdef USE_WM_KEYMAP_27X
 	/* user prefs */
 #ifdef __APPLE__
 	WM_keymap_add_item(keymap, "SCREEN_OT_userpref_show", COMMAKEY, KM_PRESS, KM_OSKEY, 0);
 #endif
+#ifdef USE_WM_KEYMAP_27X
 	WM_keymap_add_item(keymap, "SCREEN_OT_userpref_show", UKEY, KM_PRESS, KM_CTRL | KM_ALT, 0);
 #endif



More information about the Bf-blender-cvs mailing list