[Bf-blender-cvs] [54fba73812f] blender2.8: Keymap: proportional edit keys

[Campbell Barton]

Commit: 54fba73812fe71e2087a0cdd3c819ae06c3f8ef9
Author: Campbell Barton
Date:   Wed Jul 4 18:04:45 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB54fba73812fe71e2087a0cdd3c819ae06c3f8ef9

Keymap: proportional edit keys

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

M       source/blender/editors/space_action/action_ops.c
M       source/blender/editors/space_graph/graph_ops.c

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

diff --git a/source/blender/editors/space_action/action_ops.c 
b/source/blender/editors/space_action/action_ops.c
index 5b1250e1cde..a4bbfd5cd7f 100644
--- a/source/blender/editors/space_action/action_ops.c
+++ b/source/blender/editors/space_action/action_ops.c
@@ -222,7 +222,7 @@ static void action_keymap_keyframes(wmKeyConfig *keyconf, 
wmKeyMap *keymap)
        WM_keymap_add_menu(keymap, "DOPESHEET_MT_specials", WKEY, KM_PRESS, 0, 
0);
 
        /* destructive */
-       WM_keymap_add_item(keymap, "ACTION_OT_sample", OKEY, KM_PRESS, 
KM_SHIFT, 0);
+       WM_keymap_add_item(keymap, "ACTION_OT_sample", OKEY, KM_PRESS, KM_SHIFT 
| KM_ALT, 0);
 
        WM_keymap_add_menu(keymap, "DOPESHEET_MT_delete", XKEY, KM_PRESS, 0, 0);
        WM_keymap_add_menu(keymap, "DOPESHEET_MT_delete", DELKEY, KM_PRESS, 0, 
0);
diff --git a/source/blender/editors/space_graph/graph_ops.c 
b/source/blender/editors/space_graph/graph_ops.c
index 80aba98104a..54b35b6acb6 100644
--- a/source/blender/editors/space_graph/graph_ops.c
+++ b/source/blender/editors/space_graph/graph_ops.c
@@ -49,6 +49,7 @@
 #include "ED_markers.h"
 #include "ED_screen.h"
 #include "ED_transform.h"
+#include "ED_object.h"
 
 #include "graph_intern.h"
 
@@ -609,7 +610,7 @@ static void graphedit_keymap_keyframes(wmKeyConfig 
*keyconf, wmKeyMap *keymap)
 
        /* destructive */
        WM_keymap_add_item(keymap, "GRAPH_OT_smooth", OKEY, KM_PRESS, KM_ALT, 
0);
-       WM_keymap_add_item(keymap, "GRAPH_OT_sample", OKEY, KM_PRESS, KM_SHIFT, 
0);
+       WM_keymap_add_item(keymap, "GRAPH_OT_sample", OKEY, KM_PRESS, KM_SHIFT 
| KM_ALT, 0);
 
        WM_keymap_add_item(keymap, "GRAPH_OT_bake", CKEY, KM_PRESS, KM_ALT, 0);
 
@@ -664,6 +665,7 @@ static void graphedit_keymap_keyframes(wmKeyConfig 
*keyconf, wmKeyMap *keymap)
 
        kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle", OKEY, 
KM_PRESS, 0, 0);
        RNA_string_set(kmi->ptr, "data_path", 
"tool_settings.use_proportional_fcurve");
+       ED_keymap_proportional_cycle(keyconf, keymap);
 
        /* pivot point settings */
        kmi = WM_keymap_add_item(keymap, "WM_OT_context_set_enum", COMMAKEY, 
KM_PRESS, 0, 0);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs