Commit: 9eb4a74e9f4f955bb1d1cc6b9c31d75111fae775 Author: Campbell Barton Date: Thu Jun 7 18:48:20 2018 +0200 Branches: temp-keymap-changes https://developer.blender.org/rB9eb4a74e9f4f955bb1d1cc6b9c31d75111fae775
Move pie menus into the 3D view =================================================================== M release/scripts/startup/bl_operators/wm.py M release/scripts/startup/bl_ui/space_view3d.py M source/blender/editors/mesh/mesh_ops.c M source/blender/editors/object/object_ops.c M source/blender/editors/space_view3d/view3d_ops.c =================================================================== diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py index 6eba0b18382..faece08a039 100644 --- a/release/scripts/startup/bl_operators/wm.py +++ b/release/scripts/startup/bl_operators/wm.py @@ -2403,43 +2403,6 @@ class WM_OT_toolbar(Operator): return {'FINISHED'} -class VIEW3D_PIE_object_mode_of(Menu): - bl_label = "Mode" - - def draw(self, context): - layout = self.layout - - pie = layout.menu_pie() - pie.operator_enum("OBJECT_OT_mode_set", "mode") - - -class VIEW3D_PIE_view_of(Menu): - bl_label = "View" - bl_idname = "VIEW3D_PIE_view_of" - - def draw(self, context): - layout = self.layout - - pie = layout.menu_pie() - pie.operator_enum("VIEW3D_OT_viewnumpad", "type") - pie.operator("view3d.view_selected", text="View Selected", icon='ZOOM_SELECTED') - - -class VIEW3D_PIE_view_more_of(Menu): - bl_label = "More" - - def draw(self, context): - layout = self.layout - - pie = layout.menu_pie() - pie.operator("VIEW3D_OT_view_persportho", text="Persp/Ortho", icon='RESTRICT_VIEW_OFF') - pie.operator("VIEW3D_OT_camera_to_view") - pie.operator("VIEW3D_OT_view_selected") - pie.operator("VIEW3D_OT_view_all") - pie.operator("VIEW3D_OT_localview") - pie.operator("SCREEN_OT_region_quadview") - - classes = ( BRUSH_OT_active_index_set, WM_OT_addon_disable, @@ -2496,8 +2459,4 @@ classes = ( WM_OT_url_open, WM_OT_tool_set_by_name, WM_OT_toolbar, - - VIEW3D_PIE_object_mode_of, - VIEW3D_PIE_view_of, - VIEW3D_PIE_view_more_of, ) diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index c17b089e04c..9be882ba387 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -3394,6 +3394,45 @@ class VIEW3D_MT_edit_gpencil_interpolate(Menu): layout.operator("gpencil.interpolate_sequence", text="Sequence") +class VIEW3D_PIE_object_mode(Menu): + bl_label = "Mode" + + def draw(self, context): + layout = self.layout + + pie = layout.menu_pie() + pie.operator_enum("OBJECT_OT_mode_set", "mode") + + +class VIEW3D_PIE_view(Menu): + bl_label = "View" + bl_idname = "VIEW3D_PIE_view_of" + + def draw(self, context): + layout = self.layout + + pie = layout.menu_pie() + pie.operator_enum("VIEW3D_OT_viewnumpad", "type") + pie.operator("view3d.view_selected", text="View Selected", icon='ZOOM_SELECTED') + + +class VIEW3D_PIE_view_more(Menu): + bl_label = "More" + + def draw(self, context): + layout = self.layout + + pie = layout.menu_pie() + pie.operator("VIEW3D_OT_view_persportho", text="Persp/Ortho", icon='RESTRICT_VIEW_OFF') + pie.operator("VIEW3D_OT_camera_to_view") + pie.operator("VIEW3D_OT_view_selected") + pie.operator("VIEW3D_OT_view_all") + pie.operator("VIEW3D_OT_localview") + pie.operator("SCREEN_OT_region_quadview") + + + + # ********** Panel ********** @@ -4009,6 +4048,8 @@ classes = ( VIEW3D_MT_edit_armature_delete, VIEW3D_MT_edit_gpencil_transform, VIEW3D_MT_edit_gpencil_interpolate, + VIEW3D_PIE_object_mode, + VIEW3D_PIE_view, VIEW3D_PT_grease_pencil, VIEW3D_PT_grease_pencil_palettecolor, VIEW3D_PT_view3d_properties, diff --git a/source/blender/editors/mesh/mesh_ops.c b/source/blender/editors/mesh/mesh_ops.c index e573aa38a60..f5c5a85d5ca 100644 --- a/source/blender/editors/mesh/mesh_ops.c +++ b/source/blender/editors/mesh/mesh_ops.c @@ -352,7 +352,6 @@ void ED_keymap_mesh(wmKeyConfig *keyconf) kmi = WM_keymap_add_item(keymap, "MESH_OT_select_mode", THREEKEY, KM_PRESS, KM_SHIFT, 0); RNA_enum_set(kmi->ptr, "type", SCE_SELECT_FACE); RNA_boolean_set(kmi->ptr, "use_extend", true); - /* standard mouse selection goes via space_view3d */ kmi = WM_keymap_add_item(keymap, "MESH_OT_loop_select", SELECTMOUSE, KM_PRESS, KM_ALT, 0); diff --git a/source/blender/editors/object/object_ops.c b/source/blender/editors/object/object_ops.c index 168a0118f57..af572824068 100644 --- a/source/blender/editors/object/object_ops.c +++ b/source/blender/editors/object/object_ops.c @@ -293,7 +293,7 @@ void ED_keymap_object(wmKeyConfig *keyconf) RNA_enum_set(kmi->ptr, "mode", OB_MODE_EDIT); RNA_boolean_set(kmi->ptr, "toggle", true); - kmi = WM_keymap_add_menu_pie(keymap, "VIEW3D_PIE_object_mode_of", TABKEY, KM_CLICK_DRAG, 0, 0); + kmi = WM_keymap_add_menu_pie(keymap, "VIEW3D_PIE_object_mode", TABKEY, KM_CLICK_DRAG, 0, 0); WM_keymap_add_item(keymap, "OBJECT_OT_origin_set", CKEY, KM_PRESS, KM_ALT | KM_SHIFT | KM_CTRL, 0); diff --git a/source/blender/editors/space_view3d/view3d_ops.c b/source/blender/editors/space_view3d/view3d_ops.c index 1ceededdd05..5f55e678f24 100644 --- a/source/blender/editors/space_view3d/view3d_ops.c +++ b/source/blender/editors/space_view3d/view3d_ops.c @@ -301,7 +301,7 @@ void view3d_keymap(wmKeyConfig *keyconf) kmi = WM_keymap_add_item(keymap, "VIEW3D_OT_view_all", CKEY, KM_PRESS, KM_SHIFT, 0); RNA_boolean_set(kmi->ptr, "center", true); - WM_keymap_add_menu_pie(keymap, "VIEW3D_PIE_view_of", ACCENTGRAVEKEY, KM_PRESS, 0, 0); + WM_keymap_add_menu_pie(keymap, "VIEW3D_PIE_view", ACCENTGRAVEKEY, KM_PRESS, 0, 0); /* numpad view hotkeys*/ RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD0, KM_PRESS, 0, 0)->ptr, "type", RV3D_VIEW_CAMERA); _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs