From b2a569dd68357e535c79c8a4a74947773f21023f Mon Sep 17 00:00:00 2001 From: William Reynish Date: Wed, 26 Sep 2018 17:32:11 +0200 Subject: UI: use pie menu for snap, pivot and proportional editing. * Proportional pie menu at shift+O. * Snap pie menu at shift+S. * Pivot pie menu at comma. Previous comma, ctrl+comma, period and ctrl+period shortcuts for specific pivot types were removed. Ref T56881. --- release/scripts/startup/bl_ui/space_clip.py | 14 ++++++ release/scripts/startup/bl_ui/space_dopesheet.py | 14 ++++++ release/scripts/startup/bl_ui/space_graph.py | 29 +++++++++++ release/scripts/startup/bl_ui/space_image.py | 32 ++++++++++++ release/scripts/startup/bl_ui/space_nla.py | 13 +++++ release/scripts/startup/bl_ui/space_view3d.py | 62 ++++++++++++++++++++++++ source/blender/editors/object/object_ops.c | 6 +-- source/blender/editors/space_action/action_ops.c | 2 +- source/blender/editors/space_clip/space_clip.c | 16 +----- source/blender/editors/space_graph/graph_ops.c | 14 +----- source/blender/editors/space_image/space_image.c | 12 +---- source/blender/editors/space_nla/nla_ops.c | 2 +- source/blender/editors/space_view3d/view3d_ops.c | 22 ++------- source/blender/editors/transform/transform_ops.c | 2 - source/blender/editors/uvedit/uvedit_ops.c | 2 +- 15 files changed, 175 insertions(+), 67 deletions(-) diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py index 0a2207019eb..81feab206ed 100644 --- a/release/scripts/startup/bl_ui/space_clip.py +++ b/release/scripts/startup/bl_ui/space_clip.py @@ -1438,6 +1438,19 @@ class CLIP_MT_stabilize_2d_rotation_specials(Menu): layout.operator("clip.stabilize_2d_rotation_select") +class CLIP_MT_pivot_pie(Menu): + bl_label = "Pivot Point" + + def draw(self, context): + layout = self.layout + pie = layout.menu_pie() + + pie.prop_enum(context.space_data, "pivot_point", value='BOUNDING_BOX_CENTER') + pie.prop_enum(context.space_data, "pivot_point", value='CURSOR') + pie.prop_enum(context.space_data, "pivot_point", value='INDIVIDUAL_ORIGINS') + pie.prop_enum(context.space_data, "pivot_point", value='MEDIAN_POINT') + + classes = ( CLIP_UL_tracking_objects, @@ -1494,6 +1507,7 @@ classes = ( CLIP_MT_track_color_specials, CLIP_MT_stabilize_2d_specials, CLIP_MT_stabilize_2d_rotation_specials, + CLIP_MT_pivot_pie, ) if __name__ == "__main__": # only for live edit. diff --git a/release/scripts/startup/bl_ui/space_dopesheet.py b/release/scripts/startup/bl_ui/space_dopesheet.py index d10f96b8e81..cf2afd3ab61 100644 --- a/release/scripts/startup/bl_ui/space_dopesheet.py +++ b/release/scripts/startup/bl_ui/space_dopesheet.py @@ -621,6 +621,19 @@ class DOPESHEET_MT_channel_specials(Menu): layout.operator("anim.channels_delete") +class DOPESHEET_MT_snap_pie(Menu): + bl_label = "Snap" + + def draw(self, context): + layout = self.layout + pie = layout.menu_pie() + + pie.operator("action.snap", text="Current Frame").type = 'CFRA' + pie.operator("action.snap", text="Nearest Frame").type = 'NEAREST_FRAME' + pie.operator("action.snap", text="Nearest Second").type = 'NEAREST_SECOND' + pie.operator("action.snap", text="Nearest Marker").type = 'NEAREST_MARKER' + + classes = ( DOPESHEET_HT_header, DOPESHEET_HT_editor_buttons, @@ -636,6 +649,7 @@ classes = ( DOPESHEET_MT_delete, DOPESHEET_MT_specials, DOPESHEET_MT_channel_specials, + DOPESHEET_MT_snap_pie, DOPESHEET_PT_filters, ) diff --git a/release/scripts/startup/bl_ui/space_graph.py b/release/scripts/startup/bl_ui/space_graph.py index 9b3708ce5b1..78da2215be0 100644 --- a/release/scripts/startup/bl_ui/space_graph.py +++ b/release/scripts/startup/bl_ui/space_graph.py @@ -354,6 +354,33 @@ class GRAPH_MT_specials(Menu): layout.operator_menu_enum("graph.snap", "type", text="Snap") +class GRAPH_MT_pivot_pie(Menu): + bl_label = "Pivot Point" + + def draw(self, context): + layout = self.layout + pie = layout.menu_pie() + + pie.prop_enum(context.space_data, "pivot_point", value='BOUNDING_BOX_CENTER') + pie.prop_enum(context.space_data, "pivot_point", value='CURSOR') + pie.prop_enum(context.space_data, "pivot_point", value='INDIVIDUAL_ORIGINS') + + +class GRAPH_MT_snap_pie(Menu): + bl_label = "Snap" + + def draw(self, context): + layout = self.layout + pie = layout.menu_pie() + + pie.operator("graph.snap", text="Current Frame").type = 'CFRA' + pie.operator("graph.snap", text="Cursor Value").type = 'VALUE' + pie.operator("graph.snap", text="Nearest Frame").type = 'NEAREST_FRAME' + pie.operator("graph.snap", text="Nearest Second").type = 'NEAREST_SECOND' + pie.operator("graph.snap", text="Nearest Marker").type = 'NEAREST_MARKER' + pie.operator("graph.snap", text="Flatten Handles").type = 'HORIZONTAL' + + class GRAPH_MT_channel_specials(Menu): bl_label = "F-Curve Channel Context Menu" @@ -407,6 +434,8 @@ classes = ( GRAPH_MT_delete, GRAPH_MT_specials, GRAPH_MT_channel_specials, + GRAPH_MT_pivot_pie, + GRAPH_MT_snap_pie, GRAPH_PT_filters, ) diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py index 3c61adc7cac..50b9585b06a 100644 --- a/release/scripts/startup/bl_ui/space_image.py +++ b/release/scripts/startup/bl_ui/space_image.py @@ -488,6 +488,36 @@ class IMAGE_MT_specials(Menu): layout.menu("IMAGE_MT_uvs_snap") +class IMAGE_MT_pivot_pie(Menu): + bl_label = "Pivot Point" + + def draw(self, context): + layout = self.layout + pie = layout.menu_pie() + + pie.prop_enum(context.space_data, "pivot_point", value='CENTER') + pie.prop_enum(context.space_data, "pivot_point", value='CURSOR') + pie.prop_enum(context.space_data, "pivot_point", value='INDIVIDUAL_ORIGINS') + pie.prop_enum(context.space_data, "pivot_point", value='MEDIAN') + + +class IMAGE_MT_uvs_snap_pie(Menu): + bl_label = "Snap" + + def draw(self, context): + layout = self.layout + pie = layout.menu_pie() + + layout.operator_context = 'EXEC_REGION_WIN' + + pie.operator("uv.snap_selected", text="Selected to Pixels", icon='RESTRICT_SELECT_OFF').target = 'PIXELS' + pie.operator("uv.snap_cursor", text="Cursor to Pixels", icon='CURSOR').target = 'PIXELS' + pie.operator("uv.snap_cursor", text="Cursor to Selected", icon='CURSOR').target = 'SELECTED' + pie.operator("uv.snap_selected", text="Selected to Cursor", icon='RESTRICT_SELECT_OFF').target = 'CURSOR' + pie.operator("uv.snap_selected", text="Selected to Cursor (Offset)", icon='RESTRICT_SELECT_OFF').target = 'CURSOR_OFFSET' + pie.operator("uv.snap_selected", text="Selected to Adjacent Unselected", icon='RESTRICT_SELECT_OFF').target = 'ADJACENT_UNSELECTED' + + class IMAGE_HT_header(Header): bl_space_type = 'IMAGE_EDITOR' @@ -1468,6 +1498,8 @@ classes = ( IMAGE_MT_uvs_weldalign, IMAGE_MT_uvs_select_mode, IMAGE_MT_specials, + IMAGE_MT_pivot_pie, + IMAGE_MT_uvs_snap_pie, IMAGE_HT_header, MASK_MT_editor_menus, IMAGE_PT_mask, diff --git a/release/scripts/startup/bl_ui/space_nla.py b/release/scripts/startup/bl_ui/space_nla.py index c876f1f5a76..69413d46c1f 100644 --- a/release/scripts/startup/bl_ui/space_nla.py +++ b/release/scripts/startup/bl_ui/space_nla.py @@ -232,6 +232,18 @@ class NLA_MT_edit_transform(Menu): layout.operator("transform.transform", text="Extend").mode = 'TIME_EXTEND' layout.operator("transform.transform", text="Scale").mode = 'TIME_SCALE' +class NLA_MT_snap_pie(Menu): + bl_label = "Snap" + + def draw(self, context): + layout = self.layout + pie = layout.menu_pie() + + pie.operator("nla.snap", text="Current Frame").type = 'CFRA' + pie.operator("nla.snap", text="Nearest Frame").type = 'NEAREST_FRAME' + pie.operator("nla.snap", text="Nearest Second").type = 'NEAREST_SECOND' + pie.operator("nla.snap", text="Nearest Marker").type = 'NEAREST_MARKER' + classes = ( NLA_HT_header, @@ -242,6 +254,7 @@ classes = ( NLA_MT_marker, NLA_MT_add, NLA_MT_edit_transform, + NLA_MT_snap_pie, NLA_PT_filters, ) diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index cc961fe2ce0..ae915a68ec2 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -3785,6 +3785,64 @@ class VIEW3D_MT_shading_pie(Menu): pie.prop_enum(view.shading, "type", value='RENDERED') +class VIEW3D_MT_pivot_pie(Menu): + bl_label = "Pivot Point" + + def draw(self, context): + layout = self.layout + pie = layout.menu_pie() + obj = context.active_object + mode = context.mode + + pie.prop_enum(context.scene.tool_settings, "transform_pivot_point", value='BOUNDING_BOX_CENTER') + pie.prop_enum(context.scene.tool_settings, "transform_pivot_point", value='CURSOR') + pie.prop_enum(context.scene.tool_settings, "transform_pivot_point", value='INDIVIDUAL_ORIGINS') + pie.prop_enum(context.scene.tool_settings, "transform_pivot_point", value='MEDIAN_POINT') + pie.prop_enum(context.scene.tool_settings, "transform_pivot_point", value='ACTIVE_ELEMENT') + if (obj is None) or (mode in {'OBJECT', 'POSE', 'WEIGHT_PAINT'}): + pie.prop(context.scene.tool_settings, "use_transform_pivot_point_align", text="Center Points Only") + + + +class VIEW3D_MT_orientations_pie(Menu): + bl_label = "Orientation" + + def draw(self, context): + layout = self.layout + pie = layout.menu_pie() + scene = context.scene + orientation = scene.current_orientation + + pie.prop(scene, "transform_orientation", expand=True) + + +class VIEW3D_MT_snap_pie(Menu): + bl_label = "Snap" + + def draw(self, context): + layout = self.layout + pie = layout.menu_pie() + + pie.operator("view3d.snap_cursor_to_grid", text="Cursor to Grid", icon='CURSOR') + pie.operator("view3d.snap_selected_to_grid", text="Selection to Grid", icon='RESTRICT_SELECT_OFF') + pie.operator("view3d.snap_cursor_to_selected", text="Cursor to Selected", icon='CURSOR') + pie.operator("view3d.snap_selected_to_cursor", text="Selection to Cursor", icon='RESTRICT_SELECT_OFF').use_offset = False + pie.operator("view3d.snap_selected_to_cursor", text="Selection to Cursor (Keep Offset)", icon='RESTRICT_SELECT_OFF').use_offset = True + pie.operator("view3d.snap_selected_to_active", text="Selection to Active", icon='RESTRICT_SELECT_OFF') + pie.operator("view3d.snap_cursor_to_center", text="Cursor to Center", icon='CURSOR') + pie.operator("view3d.snap_cursor_to_active", text="Cursor to Active", icon='CURSOR') + +class VIEW3D_MT_proportional_editing_falloff_pie(Menu): + bl_label = "Proportional Editing Falloff" + + def draw(self, context): + layout = self.layout + pie = layout.menu_pie() + tool_settings = context.scene.tool_settings + + pie.prop(tool_settings, "proportional_edit_falloff", expand=True) + + # ********** Panel ********** @@ -5182,6 +5240,10 @@ classes = ( VIEW3D_MT_object_mode_pie, VIEW3D_MT_view_pie, VIEW3D_MT_shading_pie, + VIEW3D_MT_pivot_pie, + VIEW3D_MT_snap_pie, + VIEW3D_MT_orientations_pie, + VIEW3D_MT_proportional_editing_falloff_pie, VIEW3D_PT_view3d_properties, VIEW3D_PT_view3d_camera_lock, VIEW3D_PT_view3d_cursor, diff --git a/source/blender/editors/object/object_ops.c b/source/blender/editors/object/object_ops.c index d504a0e21f8..46598041100 100644 --- a/source/blender/editors/object/object_ops.c +++ b/source/blender/editors/object/object_ops.c @@ -463,11 +463,7 @@ void ED_keymap_object(wmKeyConfig *keyconf) void ED_keymap_proportional_cycle(struct wmKeyConfig *UNUSED(keyconf), struct wmKeyMap *keymap) { - wmKeyMapItem *kmi; - - kmi = WM_keymap_add_item(keymap, "WM_OT_context_cycle_enum", OKEY, KM_PRESS, KM_SHIFT, 0); - RNA_string_set(kmi->ptr, "data_path", "tool_settings.proportional_edit_falloff"); - RNA_boolean_set(kmi->ptr, "wrap", true); + WM_keymap_add_menu_pie(keymap, "VIEW3D_MT_proportional_editing_falloff_pie", OKEY, KM_PRESS, KM_SHIFT, 0); } void ED_keymap_proportional_obmode(struct wmKeyConfig *UNUSED(keyconf), struct wmKeyMap *keymap) diff --git a/source/blender/editors/space_action/action_ops.c b/source/blender/editors/space_action/action_ops.c index 290020c7840..8f3bbaa0bf5 100644 --- a/source/blender/editors/space_action/action_ops.c +++ b/source/blender/editors/space_action/action_ops.c @@ -207,7 +207,7 @@ static void action_keymap_keyframes(wmKeyConfig *keyconf, wmKeyMap *keymap) WM_keymap_add_item(keymap, "ACTION_OT_frame_jump", GKEY, KM_PRESS, KM_CTRL, 0); /* menu + single-step transform */ - WM_keymap_add_item(keymap, "ACTION_OT_snap", SKEY, KM_PRESS, KM_SHIFT, 0); + WM_keymap_add_menu_pie(keymap, "DOPESHEET_MT_snap_pie", SKEY, KM_PRESS, KM_SHIFT, 0); WM_keymap_add_item(keymap, "ACTION_OT_mirror", MKEY, KM_PRESS, KM_CTRL, 0); /* menu + set setting */ diff --git a/source/blender/editors/space_clip/space_clip.c b/source/blender/editors/space_clip/space_clip.c index a6fc6da9a55..c20438051f3 100644 --- a/source/blender/editors/space_clip/space_clip.c +++ b/source/blender/editors/space_clip/space_clip.c @@ -729,21 +729,7 @@ static void clip_keymap(struct wmKeyConfig *keyconf) WM_keymap_add_item(keymap, "CLIP_OT_cursor_set", ACTIONMOUSE, KM_PRESS, 0, 0); /* pivot point */ - kmi = WM_keymap_add_item(keymap, "WM_OT_context_set_enum", COMMAKEY, KM_PRESS, 0, 0); - RNA_string_set(kmi->ptr, "data_path", "space_data.pivot_point"); - RNA_string_set(kmi->ptr, "value", "BOUNDING_BOX_CENTER"); - - kmi = WM_keymap_add_item(keymap, "WM_OT_context_set_enum", COMMAKEY, KM_PRESS, KM_CTRL, 0); /* 2.4x allowed Comma+Shift too, rather not use both */ - RNA_string_set(kmi->ptr, "data_path", "space_data.pivot_point"); - RNA_string_set(kmi->ptr, "value", "MEDIAN_POINT"); - - kmi = WM_keymap_add_item(keymap, "WM_OT_context_set_enum", PERIODKEY, KM_PRESS, 0, 0); - RNA_string_set(kmi->ptr, "data_path", "space_data.pivot_point"); - RNA_string_set(kmi->ptr, "value", "CURSOR"); - - kmi = WM_keymap_add_item(keymap, "WM_OT_context_set_enum", PERIODKEY, KM_PRESS, KM_CTRL, 0); - RNA_string_set(kmi->ptr, "data_path", "space_data.pivot_point"); - RNA_string_set(kmi->ptr, "value", "INDIVIDUAL_ORIGINS"); + WM_keymap_add_menu_pie(keymap, "CLIP_MT_pivot_pie", COMMAKEY, KM_PRESS, 0, 0); /* Copy-paste */ WM_keymap_add_item(keymap, "CLIP_OT_copy_tracks", CKEY, KM_PRESS, KM_CTRL, 0); diff --git a/source/blender/editors/space_graph/graph_ops.c b/source/blender/editors/space_graph/graph_ops.c index c212ad8f010..8ac9bc723bf 100644 --- a/source/blender/editors/space_graph/graph_ops.c +++ b/source/blender/editors/space_graph/graph_ops.c @@ -597,7 +597,7 @@ static void graphedit_keymap_keyframes(wmKeyConfig *keyconf, wmKeyMap *keymap) WM_keymap_add_item(keymap, "GRAPH_OT_frame_jump", GKEY, KM_PRESS, KM_CTRL, 0); /* menu + single-step transform */ - WM_keymap_add_item(keymap, "GRAPH_OT_snap", SKEY, KM_PRESS, KM_SHIFT, 0); + WM_keymap_add_menu_pie(keymap, "GRAPH_MT_snap_pie", SKEY, KM_PRESS, KM_SHIFT, 0); WM_keymap_add_item(keymap, "GRAPH_OT_mirror", MKEY, KM_PRESS, KM_CTRL, 0); WM_keymap_add_item(keymap, "GRAPH_OT_handle_type", VKEY, KM_PRESS, 0, 0); @@ -665,17 +665,7 @@ static void graphedit_keymap_keyframes(wmKeyConfig *keyconf, wmKeyMap *keymap) 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); - RNA_string_set(kmi->ptr, "data_path", "space_data.pivot_point"); - RNA_string_set(kmi->ptr, "value", "BOUNDING_BOX_CENTER"); - - kmi = WM_keymap_add_item(keymap, "WM_OT_context_set_enum", PERIODKEY, KM_PRESS, 0, 0); - RNA_string_set(kmi->ptr, "data_path", "space_data.pivot_point"); - RNA_string_set(kmi->ptr, "value", "CURSOR"); - - kmi = WM_keymap_add_item(keymap, "WM_OT_context_set_enum", PERIODKEY, KM_PRESS, KM_CTRL, 0); - RNA_string_set(kmi->ptr, "data_path", "space_data.pivot_point"); - RNA_string_set(kmi->ptr, "value", "INDIVIDUAL_ORIGINS"); + WM_keymap_add_menu_pie(keymap, "GRAPH_MT_pivot_pie", COMMAKEY, KM_PRESS, 0, 0); /* special markers hotkeys for anim editors: see note in definition of this function */ ED_marker_keymap_animedit_conflictfree(keymap); diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c index 296436b9bad..717fc993632 100644 --- a/source/blender/editors/space_image/space_image.c +++ b/source/blender/editors/space_image/space_image.c @@ -369,17 +369,7 @@ static void image_keymap(struct wmKeyConfig *keyconf) } /* pivot */ - kmi = WM_keymap_add_item(keymap, "WM_OT_context_set_enum", COMMAKEY, KM_PRESS, 0, 0); - RNA_string_set(kmi->ptr, "data_path", "space_data.pivot_point"); - RNA_string_set(kmi->ptr, "value", "CENTER"); - - kmi = WM_keymap_add_item(keymap, "WM_OT_context_set_enum", COMMAKEY, KM_PRESS, KM_CTRL, 0); - RNA_string_set(kmi->ptr, "data_path", "space_data.pivot_point"); - RNA_string_set(kmi->ptr, "value", "MEDIAN"); - - kmi = WM_keymap_add_item(keymap, "WM_OT_context_set_enum", PERIODKEY, KM_PRESS, 0, 0); - RNA_string_set(kmi->ptr, "data_path", "space_data.pivot_point"); - RNA_string_set(kmi->ptr, "value", "CURSOR"); + WM_keymap_add_menu_pie(keymap, "IMAGE_MT_pivot_pie", COMMAKEY, KM_PRESS, 0, 0); /* render border */ WM_keymap_add_item(keymap, "IMAGE_OT_render_border", BKEY, KM_PRESS, KM_CTRL, 0); diff --git a/source/blender/editors/space_nla/nla_ops.c b/source/blender/editors/space_nla/nla_ops.c index 99cdf27326c..05ca148bf5d 100644 --- a/source/blender/editors/space_nla/nla_ops.c +++ b/source/blender/editors/space_nla/nla_ops.c @@ -290,7 +290,7 @@ static void nla_keymap_main(wmKeyConfig *keyconf, wmKeyMap *keymap) WM_keymap_add_item(keymap, "NLA_OT_clear_scale", SKEY, KM_PRESS, KM_ALT, 0); /* snap */ - WM_keymap_add_item(keymap, "NLA_OT_snap", SKEY, KM_PRESS, KM_SHIFT, 0); + WM_keymap_add_menu_pie(keymap, "NLA_MT_snap_pie", SKEY, KM_PRESS, KM_SHIFT, 0); /* add f-modifier */ WM_keymap_add_item(keymap, "NLA_OT_fmodifier_add", MKEY, KM_PRESS, KM_CTRL | KM_SHIFT, 0); diff --git a/source/blender/editors/space_view3d/view3d_ops.c b/source/blender/editors/space_view3d/view3d_ops.c index 9711322c103..a7e0d45b938 100644 --- a/source/blender/editors/space_view3d/view3d_ops.c +++ b/source/blender/editors/space_view3d/view3d_ops.c @@ -501,7 +501,7 @@ void view3d_keymap(wmKeyConfig *keyconf) WM_keymap_add_item(keymap, "VIEW3D_OT_camera_to_view", PAD0, KM_PRESS, KM_ALT | KM_CTRL, 0); WM_keymap_add_item(keymap, "VIEW3D_OT_object_as_camera", PAD0, KM_PRESS, KM_CTRL, 0); - WM_keymap_add_menu(keymap, "VIEW3D_MT_snap", SKEY, KM_PRESS, KM_SHIFT, 0); + WM_keymap_add_menu_pie(keymap, "VIEW3D_MT_snap_pie", SKEY, KM_PRESS, KM_SHIFT, 0); #ifdef __APPLE__ WM_keymap_add_item(keymap, "VIEW3D_OT_copybuffer", CKEY, KM_PRESS, KM_OSKEY, 0); @@ -511,29 +511,13 @@ void view3d_keymap(wmKeyConfig *keyconf) WM_keymap_add_item(keymap, "VIEW3D_OT_pastebuffer", VKEY, KM_PRESS, KM_CTRL, 0); /* context ops */ - kmi = WM_keymap_add_item(keymap, "WM_OT_context_set_enum", COMMAKEY, KM_PRESS, 0, 0); - RNA_string_set(kmi->ptr, "data_path", "tool_settings.transform_pivot_point"); - RNA_string_set(kmi->ptr, "value", "BOUNDING_BOX_CENTER"); - - /* 2.4x allowed Comma+Shift too, rather not use both */ - kmi = WM_keymap_add_item(keymap, "WM_OT_context_set_enum", COMMAKEY, KM_PRESS, KM_CTRL, 0); - RNA_string_set(kmi->ptr, "data_path", "tool_settings.transform_pivot_point"); - RNA_string_set(kmi->ptr, "value", "MEDIAN_POINT"); + WM_keymap_add_menu_pie(keymap, "VIEW3D_MT_pivot_pie", COMMAKEY, KM_PRESS, 0, 0); + WM_keymap_add_menu_pie(keymap, "VIEW3D_MT_orientations_pie", PERIODKEY, KM_PRESS, 0, 0); kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle", COMMAKEY, KM_PRESS, KM_ALT, 0); /* new in 2.5 */ RNA_string_set(kmi->ptr, "data_path", "tool_settings.use_transform_pivot_point_align"); - kmi = WM_keymap_add_item(keymap, "WM_OT_context_set_enum", PERIODKEY, KM_PRESS, 0, 0); - RNA_string_set(kmi->ptr, "data_path", "tool_settings.transform_pivot_point"); - RNA_string_set(kmi->ptr, "value", "CURSOR"); - - kmi = WM_keymap_add_item(keymap, "WM_OT_context_set_enum", PERIODKEY, KM_PRESS, KM_CTRL, 0); - RNA_string_set(kmi->ptr, "data_path", "tool_settings.transform_pivot_point"); - RNA_string_set(kmi->ptr, "value", "INDIVIDUAL_ORIGINS"); - kmi = WM_keymap_add_item(keymap, "WM_OT_context_set_enum", PERIODKEY, KM_PRESS, KM_ALT, 0); - RNA_string_set(kmi->ptr, "data_path", "tool_settings.transform_pivot_point"); - RNA_string_set(kmi->ptr, "value", "ACTIVE_ELEMENT"); #ifdef USE_WM_KEYMAP_27X kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle", SPACEKEY, KM_PRESS, KM_CTRL, 0); /* new in 2.5 */ diff --git a/source/blender/editors/transform/transform_ops.c b/source/blender/editors/transform/transform_ops.c index 189d7eed756..3e6e1f85002 100644 --- a/source/blender/editors/transform/transform_ops.c +++ b/source/blender/editors/transform/transform_ops.c @@ -1160,8 +1160,6 @@ void transform_keymap_for_space(wmKeyConfig *keyconf, wmKeyMap *keymap, int spac WM_keymap_add_item(keymap, OP_SHEAR, SKEY, KM_PRESS, KM_ALT | KM_CTRL | KM_SHIFT, 0); - WM_keymap_add_item(keymap, "TRANSFORM_OT_select_orientation", SPACEKEY, KM_PRESS, KM_ALT, 0); - #ifdef USE_WM_KEYMAP_27X kmi = WM_keymap_add_item(keymap, "TRANSFORM_OT_create_orientation", SPACEKEY, KM_PRESS, KM_CTRL | KM_ALT, 0); RNA_boolean_set(kmi->ptr, "use", true); diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index 5ea16a6026f..27e67580979 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -4779,7 +4779,7 @@ void ED_keymap_uvedit(wmKeyConfig *keyconf) WM_keymap_add_item(keymap, "UV_OT_cursor_set", ACTIONMOUSE, KM_PRESS, 0, 0); /* menus */ - WM_keymap_add_menu(keymap, "IMAGE_MT_uvs_snap", SKEY, KM_PRESS, KM_SHIFT, 0); + WM_keymap_add_menu_pie(keymap, "IMAGE_MT_uvs_snap_pie", SKEY, KM_PRESS, KM_SHIFT, 0); WM_keymap_add_menu(keymap, "IMAGE_MT_uvs_select_mode", TABKEY, KM_PRESS, KM_CTRL, 0); ED_keymap_proportional_cycle(keyconf, keymap); -- cgit v1.2.3