From 8d11c9e82893e231b2abc093d815deb79866e03b Mon Sep 17 00:00:00 2001 From: meta-androcto Date: Mon, 2 Sep 2019 08:50:08 +1000 Subject: space_view3d_spacebar_menu: large commit, rewrite: T68591 --- space_view3d_spacebar_menu/__init__.py | 612 +++++++++-------------- space_view3d_spacebar_menu/animation_menus.py | 17 +- space_view3d_spacebar_menu/curve_menus.py | 63 +-- space_view3d_spacebar_menu/edit_mesh.py | 264 +--------- space_view3d_spacebar_menu/object_menus.py | 241 +++------ space_view3d_spacebar_menu/sculpt_brush_paint.py | 339 ------------- space_view3d_spacebar_menu/select_menus.py | 440 ---------------- space_view3d_spacebar_menu/snap_origin_cursor.py | 230 +++++---- space_view3d_spacebar_menu/transform_menus.py | 56 +-- space_view3d_spacebar_menu/view_menus.py | 44 +- 10 files changed, 507 insertions(+), 1799 deletions(-) delete mode 100644 space_view3d_spacebar_menu/sculpt_brush_paint.py delete mode 100644 space_view3d_spacebar_menu/select_menus.py diff --git a/space_view3d_spacebar_menu/__init__.py b/space_view3d_spacebar_menu/__init__.py index 2cf797ef..201b9506 100644 --- a/space_view3d_spacebar_menu/__init__.py +++ b/space_view3d_spacebar_menu/__init__.py @@ -35,26 +35,23 @@ if "bpy" in locals(): importlib.reload(object_menus) importlib.reload(edit_mesh) importlib.reload(transform_menus) - importlib.reload(select_menus) importlib.reload(view_menus) importlib.reload(armature_menus) importlib.reload(curve_menus) importlib.reload(snap_origin_cursor) - importlib.reload(sculpt_brush_paint) importlib.reload(animation_menus) else: from . import object_menus from . import edit_mesh from . import transform_menus - from . import select_menus from . import view_menus from . import armature_menus from . import curve_menus from . import snap_origin_cursor - from . import sculpt_brush_paint from . import animation_menus + import bpy from bpy.types import ( Operator, @@ -66,8 +63,6 @@ from bpy.props import ( StringProperty, ) -from bl_ui.properties_paint_common import UnifiedPaintPanel - # Dynamic Context Sensitive Menu # # Main Menu based on Object Type & 3d View Editor Mode # @@ -81,6 +76,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu): layout.operator_context = 'INVOKE_REGION_WIN' obj = context.active_object view = context.space_data + # No Object Selected # ob = bpy.context.object if not ob or not ob.select_get(): @@ -95,8 +91,9 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu): layout.menu("INFO_MT_area", icon='WORKSPACE') layout.menu("VIEW3D_MT_view_viewpoint", icon='ZOOM_ALL') layout.menu("VIEW3D_MT_view_navigation", icon='PIVOT_BOUNDBOX') + layout.menu("VIEW3D_MT_select_object", icon='RESTRICT_SELECT_OFF') UseSeparator(self, context) - layout.menu("VIEW3D_MT_AddMenu", icon='OBJECT_DATAMODE') + layout.menu("VIEW3D_MT_add", icon='MESH_CUBE') UseSeparator(self, context) layout.operator("view3d.snap_cursor_to_center", text="Cursor to World Origin") @@ -118,34 +115,26 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu): layout.menu("VIEW3D_MT_Animation_Player", text="Animation", icon='PLAY') layout.menu("SCREEN_MT_user_menu", text="Quick Favorites", icon='HEART') + layout.menu("VIEW3D_MT_InteractiveMode", icon='VIEW3D') UseSeparator(self, context) - layout.menu("VIEW3D_MT_InteractiveMode", icon='EDITMODE_HLT') - layout.menu("VIEW3D_MT_view", icon='ZOOM_ALL') - layout.menu("VIEW3D_MT_Select_Object", icon='RESTRICT_SELECT_OFF') - UseSeparator(self, context) - layout.menu("VIEW3D_MT_AddMenu", icon='OBJECT_DATAMODE') - layout.menu("VIEW3D_MT_Object", icon='VIEW3D') + layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL') + layout.menu("VIEW3D_MT_select_object", icon='RESTRICT_SELECT_OFF') + layout.menu("VIEW3D_MT_add", icon='MESH_CUBE') + layout.menu("VIEW3D_MT_Camera_Options", icon='CAMERA_DATA') UseSeparator(self, context) + layout.menu("VIEW3D_MT_Object", icon='OBJECT_DATAMODE') layout.menu("VIEW3D_MT_TransformMenu", icon='EMPTY_ARROWS') - layout.menu("VIEW3D_MT_MirrorMenu", icon='MOD_MIRROR') layout.menu("VIEW3D_MT_CursorMenu", icon='PIVOT_CURSOR') UseSeparator(self, context) - layout.menu("VIEW3D_MT_ParentMenu", icon='PIVOT_ACTIVE') - layout.menu("VIEW3D_MT_GroupMenu", icon='GROUP') + layout.menu("VIEW3D_MT_object_collection", text = "Collections", icon='GROUP') UseSeparator(self, context) - layout.menu("VIEW3D_MT_object_context_menu", text="Specials", icon='SOLO_OFF') -# if context.gpencil_data and context.gpencil_data.use_stroke_edit_mode: -# layout.menu("VIEW3D_MT_Edit_Gpencil", icon='GREASEPENCIL') - layout.menu("VIEW3D_MT_Camera_Options", icon='OUTLINER_OB_CAMERA') layout.operator_menu_enum("object.modifier_add", "type", icon='MODIFIER') - layout.operator_menu_enum("object.constraint_add", - "type", text="Add Constraint", icon='CONSTRAINT') UseSeparator(self, context) layout.operator("object.delete", text="Delete Object", icon='X') UseSeparator(self, context) layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT') - # Mesh Edit Mode # +# Mesh Edit Mode # if obj and obj.type == 'MESH' and obj.mode in {'EDIT'}: layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM') @@ -153,32 +142,29 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu): layout.menu("VIEW3D_MT_Animation_Player", text="Animation", icon='PLAY') layout.menu("SCREEN_MT_user_menu", text="Quick Favorites", icon='HEART') - UseSeparator(self, context) layout.menu("VIEW3D_MT_InteractiveMode", icon='EDITMODE_HLT') - layout.menu("VIEW3D_MT_view", icon='ZOOM_ALL') - layout.menu("VIEW3D_MT_Select_Edit_Mesh", icon='RESTRICT_SELECT_OFF') layout.menu("VIEW3D_MT_Edit_Multi", icon='VERTEXSEL') UseSeparator(self, context) - layout.menu("VIEW3D_MT_mesh_add", text="Add Mesh", icon='OUTLINER_OB_MESH') - layout.menu("VIEW3D_MT_Edit_Mesh", text="Mesh", icon='MESH_DATA') + layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL') + layout.menu("VIEW3D_MT_select_edit_mesh", icon='RESTRICT_SELECT_OFF') + layout.menu("VIEW3D_MT_mesh_add", text="Add Mesh", icon='MESH_CUBE') + layout.menu("VIEW3D_MT_edit_mesh", text="Mesh", icon='MESH_DATA') UseSeparator(self, context) - layout.menu("VIEW3D_MT_TransformMenuEdit", icon='EMPTY_ARROWS') - layout.menu("VIEW3D_MT_MirrorMenuEM", icon='MOD_MIRROR') - layout.menu("VIEW3D_MT_EditCursorMenu", icon='PIVOT_CURSOR') + layout.menu("VIEW3D_MT_edit_mesh_vertices", icon='VERTEXSEL') + layout.menu("VIEW3D_MT_edit_mesh_edges", icon='EDGESEL') + layout.menu("VIEW3D_MT_edit_mesh_faces", icon='FACESEL') UseSeparator(self, context) - layout.menu("VIEW3D_MT_UV_Map", icon='MOD_UVPROJECT') - layout.menu("VIEW3D_MT_edit_mesh_context_menu", text="Specials", icon='SOLO_OFF') - layout.menu("VIEW3D_MT_edit_mesh_extrude", icon='XRAY') + layout.menu("VIEW3D_MT_uv_map", icon='MOD_UVPROJECT') + UseSeparator(self, context) + layout.menu("VIEW3D_MT_EditCursorMenu", icon='PIVOT_CURSOR') UseSeparator(self, context) layout.operator_menu_enum("object.modifier_add", "type", icon='MODIFIER') - layout.operator_menu_enum("object.constraint_add", - "type", text="Add Constraint", icon='CONSTRAINT') UseSeparator(self, context) layout.menu("VIEW3D_MT_edit_mesh_delete", icon='X') UseSeparator(self, context) layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT') - # Sculpt Mode # +# Sculpt Mode # if obj and obj.type == 'MESH' and obj.mode in {'SCULPT'}: layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM') @@ -186,20 +172,13 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu): layout.menu("VIEW3D_MT_Animation_Player", text="Animation", icon='PLAY') layout.menu("SCREEN_MT_user_menu", text="Quick Favorites", icon='HEART') - UseSeparator(self, context) layout.menu("VIEW3D_MT_InteractiveMode", icon='EDITMODE_HLT') - layout.menu("VIEW3D_MT_view", icon='ZOOM_ALL') - UseSeparator(self, context) - layout.menu("VIEW3D_MT_Sculpts", icon='SCULPTMODE_HLT') - layout.menu("VIEW3D_MT_Angle_Control", text="Angle Control", icon='BRUSH_SCULPT_DRAW') - layout.menu("VIEW3D_MT_Brush_Settings", icon='BRUSH_DATA') - layout.menu("VIEW3D_MT_Hide_Masks", icon='RESTRICT_VIEW_OFF') - UseSeparator(self, context) - layout.menu("VIEW3D_MT_Sculpt_Specials", icon='SOLO_OFF') UseSeparator(self, context) + layout.menu("VIEW3D_MT_view", icon='ZOOM_ALL') + layout.menu("VIEW3D_MT_sculpt", icon='SCULPTMODE_HLT') layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT') - # Vertex Paint # +# Vertex Paint # if obj and obj.type == 'MESH' and obj.mode in {'VERTEX_PAINT'}: layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM') @@ -207,18 +186,13 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu): text="Animation", icon='PLAY') layout.operator("wm.toolbar", text="Tools", icon='TOOL_SETTINGS') layout.menu("SCREEN_MT_user_menu", text="Quick Favorites", icon='HEART') - UseSeparator(self, context) layout.menu("VIEW3D_MT_InteractiveMode", icon='EDITMODE_HLT') - layout.menu("VIEW3D_MT_view", icon='ZOOM_ALL') - UseSeparator(self, context) - # layout.menu("VIEW3D_MT_Brush_Settings", icon='BRUSH_DATA') - layout.menu("VIEW3D_MT_Brush_Selection", - text="Vertex Paint Tool") - layout.menu("VIEW3D_MT_Vertex_Colors", icon='GROUP_VCOL') UseSeparator(self, context) + layout.menu("VIEW3D_MT_view", icon='ZOOM_ALL') + layout.menu("VIEW3D_MT_paint_vertex", icon='VPAINT_HLT') layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT') - # Weight Paint Menu # +# Weight Paint Menu # if obj and obj.type == 'MESH' and obj.mode in {'WEIGHT_PAINT'}: layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM') @@ -226,18 +200,13 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu): text="Animation", icon='PLAY') layout.operator("wm.toolbar", text="Tools", icon='TOOL_SETTINGS') layout.menu("SCREEN_MT_user_menu", text="Quick Favorites", icon='HEART') - UseSeparator(self, context) layout.menu("VIEW3D_MT_InteractiveMode", icon='EDITMODE_HLT') - layout.menu("VIEW3D_MT_view", icon='ZOOM_ALL') - UseSeparator(self, context) - layout.menu("VIEW3D_MT_Paint_Weights", icon='WPAINT_HLT') - # layout.menu("VIEW3D_MT_Brush_Settings", icon='BRUSH_DATA') - layout.menu("VIEW3D_MT_Brush_Selection", - text="Weight Paint Tool", icon='BRUSH_TEXMASK') UseSeparator(self, context) + layout.menu("VIEW3D_MT_view", icon='ZOOM_ALL') + layout.menu("VIEW3D_MT_paint_weight", icon='WPAINT_HLT') layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT') - # Texture Paint # +# Texture Paint # if obj and obj.type == 'MESH' and obj.mode in {'TEXTURE_PAINT'}: layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM') @@ -245,16 +214,12 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu): text="Animation", icon='PLAY') layout.operator("wm.toolbar", text="Tools", icon='TOOL_SETTINGS') layout.menu("SCREEN_MT_user_menu", text="Quick Favorites", icon='HEART') - UseSeparator(self, context) layout.menu("VIEW3D_MT_InteractiveMode", icon='EDITMODE_HLT') - layout.menu("VIEW3D_MT_view", icon='ZOOM_ALL') - # layout.menu("VIEW3D_MT_Brush_Settings", icon='BRUSH_DATA') - layout.menu("VIEW3D_MT_Brush_Selection", - text="Texture Paint Tool", icon='SCULPTMODE_HLT') UseSeparator(self, context) + layout.menu("VIEW3D_MT_view", icon='ZOOM_ALL') layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT') - # Curve Object Mode # +# Curve Object Mode # if obj and obj.type == 'CURVE' and obj.mode in {'OBJECT'}: layout.operator_context = 'INVOKE_REGION_WIN' @@ -263,33 +228,26 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu): layout.menu("VIEW3D_MT_Animation_Player", text="Animation", icon='PLAY') layout.menu("SCREEN_MT_user_menu", text="Quick Favorites", icon='HEART') - UseSeparator(self, context) layout.menu("VIEW3D_MT_Object_Interactive_Other", icon='OBJECT_DATA') - layout.menu("VIEW3D_MT_view", icon='ZOOM_ALL') - layout.menu("VIEW3D_MT_Select_Object", icon='RESTRICT_SELECT_OFF') UseSeparator(self, context) - layout.menu("VIEW3D_MT_AddMenu", icon='OBJECT_DATAMODE') - layout.menu("VIEW3D_MT_Object", icon='VIEW3D') + layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL') + layout.menu("VIEW3D_MT_select_object", icon='RESTRICT_SELECT_OFF') + layout.menu("VIEW3D_MT_add", icon='MESH_CUBE') + layout.menu("VIEW3D_MT_Camera_Options", icon='CAMERA_DATA') UseSeparator(self, context) + layout.menu("VIEW3D_MT_Object", icon='OBJECT_DATAMODE') layout.menu("VIEW3D_MT_TransformMenu", icon='EMPTY_ARROWS') - layout.menu("VIEW3D_MT_MirrorMenu", icon='MOD_MIRROR') layout.menu("VIEW3D_MT_CursorMenu", icon='PIVOT_CURSOR') UseSeparator(self, context) - layout.menu("VIEW3D_MT_ParentMenu", icon='PIVOT_ACTIVE') - layout.menu("VIEW3D_MT_GroupMenu", icon='GROUP') - UseSeparator(self, context) - layout.menu("VIEW3D_MT_object_context_menu", text="Specials", icon='SOLO_OFF') - layout.menu("VIEW3D_MT_Camera_Options", icon='OUTLINER_OB_CAMERA') + layout.menu("VIEW3D_MT_object_collection", text = "Collections", icon='GROUP') UseSeparator(self, context) layout.operator_menu_enum("object.modifier_add", "type", icon='MODIFIER') - layout.operator_menu_enum("object.constraint_add", - "type", text="Add Constraint", icon='CONSTRAINT') UseSeparator(self, context) layout.operator("object.delete", text="Delete Object", icon='X') UseSeparator(self, context) layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT') - # Edit Curve # +# Edit Curve # if obj and obj.type == 'CURVE' and obj.mode in {'EDIT'}: layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM') @@ -297,64 +255,54 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu): text="Animation", icon='PLAY') layout.operator("wm.toolbar", text="Tools", icon='TOOL_SETTINGS') layout.menu("SCREEN_MT_user_menu", text="Quick Favorites", icon='HEART') - UseSeparator(self, context) layout.menu("VIEW3D_MT_Object_Interactive_Other", icon='OBJECT_DATA') - layout.menu("VIEW3D_MT_view", icon='ZOOM_ALL') - layout.menu("VIEW3D_MT_Select_Edit_Curve", - icon='RESTRICT_SELECT_OFF') UseSeparator(self, context) + layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL') + layout.menu("VIEW3D_MT_select_edit_curve", + icon='RESTRICT_SELECT_OFF') layout.menu("VIEW3D_MT_curve_add", text="Add Curve", icon='OUTLINER_OB_CURVE') - layout.menu("VIEW3D_MT_Edit_Curve", icon='CURVE_DATA') UseSeparator(self, context) - layout.menu("VIEW3D_MT_TransformMenu", icon='EMPTY_ARROWS') - layout.menu("VIEW3D_MT_MirrorMenu", icon='MOD_MIRROR') + layout.menu("VIEW3D_MT_Edit_Curve", icon='CURVE_DATA') + layout.menu("VIEW3D_MT_transform", icon='EMPTY_ARROWS') layout.menu("VIEW3D_MT_CursorMenu", icon='PIVOT_CURSOR') - layout.menu("VIEW3D_MT_EditCurveCtrlpoints", + layout.menu("VIEW3D_MT_edit_curve_ctrlpoints", icon='CURVE_BEZCURVE') - layout.menu("VIEW3D_MT_EditCurveSpecials", - icon='SOLO_OFF') UseSeparator(self, context) - layout.operator("curve.delete", text="Delete Object", + layout.menu("VIEW3D_MT_edit_curve_delete", text="Delete", icon='X') UseSeparator(self, context) layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT') - # Surface Object Mode # +# Surface Object Mode # if obj and obj.type == 'SURFACE' and obj.mode in {'OBJECT'}: layout.operator_context = 'INVOKE_REGION_WIN' layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM') + layout.operator("wm.toolbar", text="Tools", icon='TOOL_SETTINGS') layout.menu("VIEW3D_MT_Animation_Player", text="Animation", icon='PLAY') - layout.operator("wm.toolbar", text="Tools", icon='TOOL_SETTINGS') layout.menu("SCREEN_MT_user_menu", text="Quick Favorites", icon='HEART') - UseSeparator(self, context) layout.menu("VIEW3D_MT_Object_Interactive_Other", icon='OBJECT_DATA') - layout.menu("VIEW3D_MT_view", icon='ZOOM_ALL') - layout.menu("VIEW3D_MT_Select_Object", icon='RESTRICT_SELECT_OFF') UseSeparator(self, context) - layout.menu("VIEW3D_MT_AddMenu", icon='OBJECT_DATAMODE') - layout.menu("VIEW3D_MT_Object", icon='VIEW3D') + layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL') + layout.menu("VIEW3D_MT_select_object", icon='RESTRICT_SELECT_OFF') + layout.menu("VIEW3D_MT_add", icon='MESH_CUBE') + layout.menu("VIEW3D_MT_Camera_Options", icon='CAMERA_DATA') UseSeparator(self, context) + layout.menu("VIEW3D_MT_Object", icon='OBJECT_DATAMODE') layout.menu("VIEW3D_MT_TransformMenu", icon='EMPTY_ARROWS') - layout.menu("VIEW3D_MT_MirrorMenu", icon='MOD_MIRROR') layout.menu("VIEW3D_MT_CursorMenu", icon='PIVOT_CURSOR') UseSeparator(self, context) - layout.menu("VIEW3D_MT_ParentMenu", icon='PIVOT_ACTIVE') - layout.menu("VIEW3D_MT_GroupMenu", icon='GROUP') + layout.menu("VIEW3D_MT_object_collection", text = "Collections", icon='GROUP') UseSeparator(self, context) - layout.menu("VIEW3D_MT_object_context_menu", text="Specials", icon='SOLO_OFF') - layout.menu("VIEW3D_MT_Camera_Options", icon='OUTLINER_OB_CAMERA') layout.operator_menu_enum("object.modifier_add", "type", icon='MODIFIER') - layout.operator_menu_enum("object.constraint_add", - "type", text="Add Constraint", icon='CONSTRAINT') UseSeparator(self, context) layout.operator("object.delete", text="Delete Object", icon='X') UseSeparator(self, context) layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT') - # Edit Surface # +# Edit Surface # if obj and obj.type == 'SURFACE' and obj.mode in {'EDIT'}: layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM') @@ -362,63 +310,54 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu): text="Animation", icon='PLAY') layout.operator("wm.toolbar", text="Tools", icon='TOOL_SETTINGS') layout.menu("SCREEN_MT_user_menu", text="Quick Favorites", icon='HEART') - UseSeparator(self, context) layout.menu("VIEW3D_MT_Object_Interactive_Other", icon='OBJECT_DATA') - layout.menu("VIEW3D_MT_view", icon='ZOOM_ALL') - layout.menu("VIEW3D_MT_Select_Edit_Surface", icon='RESTRICT_SELECT_OFF') UseSeparator(self, context) + layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL') + layout.menu("VIEW3D_MT_select_edit_surface", icon='RESTRICT_SELECT_OFF') layout.menu("VIEW3D_MT_surface_add", text="Add Surface", icon='OUTLINER_OB_SURFACE') - layout.menu("VIEW3D_MT_TransformMenu", icon='EMPTY_ARROWS') - layout.menu("VIEW3D_MT_MirrorMenu", icon='MOD_MIRROR') - layout.menu("VIEW3D_MT_CursorMenu", icon='PIVOT_CURSOR') UseSeparator(self, context) - layout.prop_menu_enum(settings, "proportional_edit", - icon="PROP_CON") - layout.prop_menu_enum(settings, "proportional_edit_falloff", - icon="SMOOTHCURVE") - layout.menu("VIEW3D_MT_EditCurveSpecials", - icon='SOLO_OFF') + layout.menu("VIEW3D_MT_Edit_Curve", icon='CURVE_DATA') + layout.menu("VIEW3D_MT_transform", icon='EMPTY_ARROWS') + layout.menu("VIEW3D_MT_CursorMenu", icon='PIVOT_CURSOR') + layout.menu("VIEW3D_MT_edit_curve_ctrlpoints", + icon='CURVE_BEZCURVE') UseSeparator(self, context) - layout.operator("curve.delete", text="Delete Object", - icon='CANCEL') + layout.menu("VIEW3D_MT_edit_curve_delete", text="Delete", + icon='X') UseSeparator(self, context) layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT') - # Metaball Object Mode # + +# Metaball Object Mode # if obj and obj.type == 'META' and obj.mode in {'OBJECT'}: layout.operator_context = 'INVOKE_REGION_WIN' layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM') + layout.operator("wm.toolbar", text="Tools", icon='TOOL_SETTINGS') layout.menu("VIEW3D_MT_Animation_Player", text="Animation", icon='PLAY') - layout.operator("wm.toolbar", text="Tools", icon='TOOL_SETTINGS') layout.menu("SCREEN_MT_user_menu", text="Quick Favorites", icon='HEART') - UseSeparator(self, context) layout.menu("VIEW3D_MT_Object_Interactive_Other", icon='OBJECT_DATA') - layout.menu("VIEW3D_MT_view", icon='ZOOM_ALL') - layout.menu("VIEW3D_MT_Select_Object", icon='RESTRICT_SELECT_OFF') UseSeparator(self, context) - layout.menu("VIEW3D_MT_AddMenu", icon='OBJECT_DATAMODE') - layout.menu("VIEW3D_MT_Object", icon='VIEW3D') + layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL') + layout.menu("VIEW3D_MT_select_object", icon='RESTRICT_SELECT_OFF') + layout.menu("VIEW3D_MT_add", icon='MESH_CUBE') + layout.menu("VIEW3D_MT_Camera_Options", icon='CAMERA_DATA') UseSeparator(self, context) + layout.menu("VIEW3D_MT_Object", icon='OBJECT_DATAMODE') layout.menu("VIEW3D_MT_TransformMenu", icon='EMPTY_ARROWS') - layout.menu("VIEW3D_MT_MirrorMenu", icon='MOD_MIRROR') layout.menu("VIEW3D_MT_CursorMenu", icon='PIVOT_CURSOR') UseSeparator(self, context) - layout.menu("VIEW3D_MT_ParentMenu", icon='PIVOT_ACTIVE') - layout.menu("VIEW3D_MT_GroupMenu", icon='GROUP') + layout.menu("VIEW3D_MT_object_collection", text = "Collections", icon='GROUP') UseSeparator(self, context) - layout.menu("VIEW3D_MT_object_context_menu", text="Specials", icon='SOLO_OFF') - layout.menu("VIEW3D_MT_Camera_Options", icon='OUTLINER_OB_CAMERA') + layout.operator_menu_enum("object.modifier_add", "type", icon='MODIFIER') UseSeparator(self, context) - layout.operator_menu_enum("object.constraint_add", - "type", text="Add Constraint", icon='CONSTRAINT') layout.operator("object.delete", text="Delete Object", icon='X') UseSeparator(self, context) layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT') - # Edit Metaball # +# Edit Metaball # if obj and obj.type == 'META' and obj.mode in {'EDIT'}: layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM') @@ -426,181 +365,107 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu): text="Animation", icon='PLAY') layout.operator("wm.toolbar", text="Tools", icon='TOOL_SETTINGS') layout.menu("SCREEN_MT_user_menu", text="Quick Favorites", icon='HEART') - UseSeparator(self, context) layout.menu("VIEW3D_MT_Object_Interactive_Other", icon='OBJECT_DATA') - layout.menu("VIEW3D_MT_view", icon='ZOOM_ALL') - layout.menu("VIEW3D_MT_SelectMetaball", icon='RESTRICT_SELECT_OFF') UseSeparator(self, context) + layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL') + layout.menu("VIEW3D_MT_select_edit_metaball", icon='RESTRICT_SELECT_OFF') layout.operator_menu_enum("object.metaball_add", "type", text="Add Metaball", icon='OUTLINER_OB_META') - layout.menu("VIEW3D_MT_TransformMenu", icon='EMPTY_ARROWS') - layout.menu("VIEW3D_MT_MirrorMenu", icon='MOD_MIRROR') - layout.menu("VIEW3D_MT_CursorMenu", icon='PIVOT_CURSOR') - UseSeparator(self, context) - layout.prop_menu_enum(settings, "proportional_edit", - icon="PROP_CON") - layout.prop_menu_enum(settings, "proportional_edit_falloff", - icon="SMOOTHCURVE") - UseSeparator(self, context) - layout.operator("mball.delete_metaelems", text="Delete Object", - icon='CANCEL') - UseSeparator(self, context) - layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT') - - # Text Object Mode # - if obj and obj.type == 'FONT' and obj.mode in {'OBJECT'}: - - layout.operator_context = 'INVOKE_REGION_WIN' - layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM') - layout.menu("VIEW3D_MT_Animation_Player", - text="Animation", icon='PLAY') - layout.operator("wm.toolbar", text="Tools", icon='TOOL_SETTINGS') - layout.menu("SCREEN_MT_user_menu", text="Quick Favorites", icon='HEART') - UseSeparator(self, context) - layout.operator("view3d.interactive_mode_text", icon='VIEW3D') - layout.menu("VIEW3D_MT_view", icon='ZOOM_ALL') - layout.menu("VIEW3D_MT_Select_Object", icon='RESTRICT_SELECT_OFF') UseSeparator(self, context) - layout.menu("VIEW3D_MT_AddMenu", icon='OBJECT_DATAMODE') - layout.menu("VIEW3D_MT_Object", icon='VIEW3D') - UseSeparator(self, context) - layout.menu("VIEW3D_MT_TransformMenu", icon='EMPTY_ARROWS') - layout.menu("VIEW3D_MT_MirrorMenu", icon='MOD_MIRROR') - layout.menu("VIEW3D_MT_CursorMenu", icon='PIVOT_CURSOR') - UseSeparator(self, context) - layout.menu("VIEW3D_MT_ParentMenu", icon='PIVOT_ACTIVE') - layout.menu("VIEW3D_MT_GroupMenu", icon='GROUP') - UseSeparator(self, context) - layout.menu("VIEW3D_MT_object_context_menu", text="Specials", icon='SOLO_OFF') - layout.menu("VIEW3D_MT_Camera_Options", icon='OUTLINER_OB_CAMERA') - UseSeparator(self, context) - layout.operator_menu_enum("object.modifier_add", "type", icon='MODIFIER') - layout.operator_menu_enum("object.constraint_add", - "type", text="Add Constraint", icon='CONSTRAINT') - UseSeparator(self, context) - layout.operator("object.delete", text="Delete Object", icon='X') - UseSeparator(self, context) - layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT') - - # Text Edit Mode # - # To Do: Space is already reserved for the typing tool - if obj and obj.type == 'FONT' and obj.mode in {'EDIT'}: - - layout.operator_context = 'INVOKE_REGION_WIN' - layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM') - layout.menu("VIEW3D_MT_Animation_Player", - text="Animation", icon='PLAY') - layout.operator("wm.toolbar", text="Tools", icon='TOOL_SETTINGS') - layout.menu("SCREEN_MT_user_menu", text="Quick Favorites", icon='HEART') + layout.menu("VIEW3D_MT_transform", icon='EMPTY_ARROWS') + layout.menu("VIEW3D_MT_mirror", icon='MOD_MIRROR') + layout.menu("VIEW3D_MT_CursorMenuLite", icon='PIVOT_CURSOR') + layout.operator("mball.duplicate_metaelems", icon='OUTLINER_DATA_META') + layout.menu("VIEW3D_MT_edit_meta_showhide", icon='HIDE_OFF') UseSeparator(self, context) - layout.operator("object.editmode_toggle", text="Enter Object Mode", - icon='OBJECT_DATA') - layout.menu("VIEW3D_MT_view", icon='ZOOM_ALL') - layout.menu("VIEW3D_MT_select_edit_text", icon='VIEW3D') - layout.menu("VIEW3D_MT_edit_font", icon='RESTRICT_SELECT_OFF') + layout.operator("mball.delete_metaelems", text="Delete", icon='X') UseSeparator(self, context) layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT') - # Camera Object Mode # +# Camera Object Mode # if obj and obj.type == 'CAMERA' and obj.mode in {'OBJECT'}: layout.operator_context = 'INVOKE_REGION_WIN' layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM') + layout.operator("wm.toolbar", text="Tools", icon='TOOL_SETTINGS') layout.menu("VIEW3D_MT_Animation_Player", text="Animation", icon='PLAY') - layout.operator("wm.toolbar", text="Tools", icon='TOOL_SETTINGS') layout.menu("SCREEN_MT_user_menu", text="Quick Favorites", icon='HEART') UseSeparator(self, context) - layout.menu("VIEW3D_MT_view", icon='ZOOM_ALL') - layout.menu("VIEW3D_MT_Select_Object", icon='RESTRICT_SELECT_OFF') - UseSeparator(self, context) - layout.menu("VIEW3D_MT_AddMenu", icon='OBJECT_DATAMODE') - layout.menu("VIEW3D_MT_Object", icon='VIEW3D') + layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL') + layout.menu("VIEW3D_MT_select_object", icon='RESTRICT_SELECT_OFF') + layout.menu("VIEW3D_MT_add", icon='MESH_CUBE') + layout.menu("VIEW3D_MT_Camera_Options", icon='CAMERA_DATA') UseSeparator(self, context) - layout.menu("VIEW3D_MT_TransformMenu", icon='EMPTY_ARROWS') + layout.menu("VIEW3D_MT_Object", icon='OBJECT_DATAMODE') + layout.menu("VIEW3D_MT_TransformMenuCamera", icon='EMPTY_ARROWS') layout.menu("VIEW3D_MT_CursorMenuLite", icon='PIVOT_CURSOR') UseSeparator(self, context) - layout.menu("VIEW3D_MT_ParentMenu", icon='PIVOT_ACTIVE') - layout.menu("VIEW3D_MT_GroupMenu", icon='GROUP') - UseSeparator(self, context) - layout.menu("VIEW3D_MT_object_context_menu", text="Specials", icon='SOLO_OFF') - layout.menu("VIEW3D_MT_Camera_Options", icon='OUTLINER_OB_CAMERA') + layout.menu("VIEW3D_MT_object_collection", text = "Collections", icon='GROUP') UseSeparator(self, context) - layout.operator_menu_enum("object.constraint_add", - "type", text="Add Constraint", icon='CONSTRAINT') + layout.operator_menu_enum("object.modifier_add", "type", icon='MODIFIER') UseSeparator(self, context) layout.operator("object.delete", text="Delete Object", icon='X') UseSeparator(self, context) layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT') - # Lamp Object Mode # +# Lamp Object Mode # if obj and obj.type == 'LIGHT' and obj.mode in {'OBJECT'}: layout.operator_context = 'INVOKE_REGION_WIN' layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM') + layout.operator("wm.toolbar", text="Tools", icon='TOOL_SETTINGS') layout.menu("VIEW3D_MT_Animation_Player", text="Animation", icon='PLAY') - layout.operator("wm.toolbar", text="Tools", icon='TOOL_SETTINGS') layout.menu("SCREEN_MT_user_menu", text="Quick Favorites", icon='HEART') UseSeparator(self, context) - layout.menu("VIEW3D_MT_view", icon='ZOOM_ALL') - layout.menu("VIEW3D_MT_Select_Object", icon='RESTRICT_SELECT_OFF') - UseSeparator(self, context) - layout.menu("VIEW3D_MT_AddMenu", icon='OBJECT_DATAMODE') - layout.menu("VIEW3D_MT_Object", icon='VIEW3D') + layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL') + layout.menu("VIEW3D_MT_select_object", icon='RESTRICT_SELECT_OFF') + layout.menu("VIEW3D_MT_add", icon='MESH_CUBE') + layout.menu("VIEW3D_MT_Camera_Options", icon='CAMERA_DATA') UseSeparator(self, context) + layout.menu("VIEW3D_MT_Object", icon='OBJECT_DATAMODE') layout.menu("VIEW3D_MT_TransformMenuLite", icon='EMPTY_ARROWS') layout.menu("VIEW3D_MT_CursorMenuLite", icon='PIVOT_CURSOR') UseSeparator(self, context) - layout.menu("VIEW3D_MT_ParentMenu", icon='PIVOT_ACTIVE') - layout.menu("VIEW3D_MT_GroupMenu", icon='GROUP') - UseSeparator(self, context) - layout.menu("VIEW3D_MT_object_context_menu", text="Specials", icon='SOLO_OFF') - layout.menu("VIEW3D_MT_Camera_Options", icon='OUTLINER_OB_CAMERA') + layout.menu("VIEW3D_MT_object_collection", text = "Collections", icon='GROUP') UseSeparator(self, context) - layout.operator_menu_enum("object.constraint_add", - "type", text="Add Constraint", icon='CONSTRAINT') + layout.operator_menu_enum("object.modifier_add", "type", icon='MODIFIER') UseSeparator(self, context) layout.operator("object.delete", text="Delete Object", icon='X') UseSeparator(self, context) layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT') - # Armature Object Mode # +# Armature Object Mode # if obj and obj.type == 'ARMATURE' and obj.mode in {'OBJECT'}: layout.operator_context = 'INVOKE_REGION_WIN' layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM') + layout.operator("wm.toolbar", text="Tools", icon='TOOL_SETTINGS') layout.menu("VIEW3D_MT_Animation_Player", text="Animation", icon='PLAY') - layout.operator("wm.toolbar", text="Tools", icon='TOOL_SETTINGS') layout.menu("SCREEN_MT_user_menu", text="Quick Favorites", icon='HEART') - UseSeparator(self, context) layout.menu("VIEW3D_MT_Object_Interactive_Armature", icon='VIEW3D') - layout.menu("VIEW3D_MT_view", icon='ZOOM_ALL') - layout.menu("VIEW3D_MT_Select_Object", icon='RESTRICT_SELECT_OFF') UseSeparator(self, context) - layout.menu("VIEW3D_MT_AddMenu", icon='OBJECT_DATAMODE') - layout.menu("VIEW3D_MT_Object", icon='VIEW3D') - UseSeparator(self, context) - layout.menu("VIEW3D_MT_TransformMenuArmature", icon='EMPTY_ARROWS') - layout.menu("VIEW3D_MT_MirrorMenu", icon='MOD_MIRROR') - layout.menu("VIEW3D_MT_CursorMenuLite", icon='PIVOT_CURSOR') + layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL') + layout.menu("VIEW3D_MT_select_object", icon='RESTRICT_SELECT_OFF') + layout.menu("VIEW3D_MT_add", icon='MESH_CUBE') + layout.menu("VIEW3D_MT_Camera_Options", icon='CAMERA_DATA') UseSeparator(self, context) - layout.menu("VIEW3D_MT_ParentMenu", icon='PIVOT_ACTIVE') - layout.menu("VIEW3D_MT_GroupMenu", icon='GROUP') + layout.menu("VIEW3D_MT_Object", icon='OBJECT_DATAMODE') + layout.menu("VIEW3D_MT_TransformMenu", icon='EMPTY_ARROWS') + layout.menu("VIEW3D_MT_CursorMenu", icon='PIVOT_CURSOR') UseSeparator(self, context) - layout.menu("VIEW3D_MT_object_context_menu", text="Specials", icon='SOLO_OFF') - layout.menu("VIEW3D_MT_Camera_Options", icon='OUTLINER_OB_CAMERA') + layout.menu("VIEW3D_MT_object_collection", text = "Collections", icon='GROUP') UseSeparator(self, context) - layout.operator_menu_enum("object.constraint_add", - "type", text="Add Constraint", icon='CONSTRAINT') + layout.operator_menu_enum("object.modifier_add", "type", icon='MODIFIER') UseSeparator(self, context) layout.operator("object.delete", text="Delete Object", icon='X') UseSeparator(self, context) layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT') - # Armature Edit # +# Armature Edit # if obj and obj.type == 'ARMATURE' and obj.mode in {'EDIT'}: layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM') @@ -608,10 +473,10 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu): text="Animation", icon='PLAY') layout.operator("wm.toolbar", text="Tools", icon='TOOL_SETTINGS') layout.menu("SCREEN_MT_user_menu", text="Quick Favorites", icon='HEART') - UseSeparator(self, context) layout.menu("VIEW3D_MT_Object_Interactive_Armature", icon='VIEW3D') - layout.menu("VIEW3D_MT_view", icon='ZOOM_ALL') - layout.menu("VIEW3D_MT_Select_Edit_Armature", + UseSeparator(self, context) + layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL') + layout.menu("VIEW3D_MT_select_edit_armature", icon='RESTRICT_SELECT_OFF') UseSeparator(self, context) layout.menu("VIEW3D_MT_armature_add", text="Add Armature", @@ -621,11 +486,10 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu): layout.menu("VIEW3D_MT_EditArmatureTK", icon='ARMATURE_DATA') UseSeparator(self, context) - layout.menu("VIEW3D_MT_TransformMenuArmatureEdit", icon='EMPTY_ARROWS') - layout.menu("VIEW3D_MT_MirrorMenu", icon='MOD_MIRROR') + layout.menu("VIEW3D_MT_transform_armature", icon='EMPTY_ARROWS') + layout.menu("VIEW3D_MT_mirror", icon='MOD_MIRROR') layout.menu("VIEW3D_MT_CursorMenuLite", icon='PIVOT_CURSOR') - layout.menu("VIEW3D_MT_ParentMenu", icon='PIVOT_ACTIVE') - layout.menu("VIEW3D_MT_armature_context_menu", icon='SOLO_OFF') + layout.menu("VIEW3D_MT_object_parent") layout.menu("VIEW3D_MT_edit_armature_roll", icon='BONE_DATA') UseSeparator(self, context) @@ -634,7 +498,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu): UseSeparator(self, context) layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT') - # Armature Pose # +# Armature Pose # if obj and obj.type == 'ARMATURE' and obj.mode in {'POSE'}: arm = context.active_object.data @@ -644,13 +508,13 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu): text="Animation", icon='PLAY') layout.operator("wm.toolbar", text="Tools", icon='TOOL_SETTINGS') layout.menu("SCREEN_MT_user_menu", text="Quick Favorites", icon='HEART') - UseSeparator(self, context) layout.menu("VIEW3D_MT_Object_Interactive_Armature", icon='VIEW3D') - layout.menu("VIEW3D_MT_view", icon='ZOOM_ALL') - layout.menu("VIEW3D_MT_Select_Pose", icon='RESTRICT_SELECT_OFF') + UseSeparator(self, context) + layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL') + layout.menu("VIEW3D_MT_select_pose", icon='RESTRICT_SELECT_OFF') UseSeparator(self, context) layout.menu("VIEW3D_MT_Pose", icon='ARMATURE_DATA') - layout.menu("VIEW3D_MT_TransformMenuArmaturePose", icon='EMPTY_ARROWS') + layout.menu("VIEW3D_MT_transform_armature", icon='EMPTY_ARROWS') layout.menu("VIEW3D_MT_pose_transform", icon='EMPTY_DATA') UseSeparator(self, context) layout.menu("VIEW3D_MT_CursorMenuLite", icon='PIVOT_CURSOR') @@ -662,8 +526,6 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu): layout.menu("VIEW3D_MT_pose_apply", icon='AUTO') layout.operator("pose.relax", icon='ARMATURE_DATA') - layout.menu("VIEW3D_MT_KeyframeMenu", icon='KEY_HLT') - layout.menu("VIEW3D_MT_pose_context_menu", icon='SOLO_OFF') layout.menu("VIEW3D_MT_pose_group", icon='GROUP_BONE') UseSeparator(self, context) layout.operator_menu_enum("pose.constraint_add", @@ -671,42 +533,35 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu): UseSeparator(self, context) layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT') - # Lattice Object Mode # +# Lattice Object Mode # if obj and obj.type == 'LATTICE' and obj.mode in {'OBJECT'}: layout.operator_context = 'INVOKE_REGION_WIN' layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM') + layout.operator("wm.toolbar", text="Tools", icon='TOOL_SETTINGS') layout.menu("VIEW3D_MT_Animation_Player", text="Animation", icon='PLAY') - layout.operator("wm.toolbar", text="Tools", icon='TOOL_SETTINGS') layout.menu("SCREEN_MT_user_menu", text="Quick Favorites", icon='HEART') - UseSeparator(self, context) layout.menu("VIEW3D_MT_Object_Interactive_Other", icon='OBJECT_DATA') - layout.menu("VIEW3D_MT_view", icon='ZOOM_ALL') - layout.menu("VIEW3D_MT_Select_Object", icon='RESTRICT_SELECT_OFF') UseSeparator(self, context) - layout.menu("VIEW3D_MT_AddMenu", icon='OBJECT_DATAMODE') - layout.menu("VIEW3D_MT_Object", icon='VIEW3D') + layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL') + layout.menu("VIEW3D_MT_select_object", icon='RESTRICT_SELECT_OFF') + layout.menu("VIEW3D_MT_add", icon='MESH_CUBE') + layout.menu("VIEW3D_MT_Camera_Options", icon='CAMERA_DATA') UseSeparator(self, context) - layout.menu("VIEW3D_MT_TransformMenu", icon='EMPTY_ARROWS') - layout.menu("VIEW3D_MT_MirrorMenu", icon='MOD_MIRROR') - layout.menu("VIEW3D_MT_CursorMenu", icon='PIVOT_CURSOR') - UseSeparator(self, context) - layout.menu("VIEW3D_MT_ParentMenu", icon='PIVOT_ACTIVE') - layout.menu("VIEW3D_MT_GroupMenu", icon='GROUP') + layout.menu("VIEW3D_MT_Object", icon='OBJECT_DATAMODE') + layout.menu("VIEW3D_MT_TransformMenuLite", icon='EMPTY_ARROWS') + layout.menu("VIEW3D_MT_CursorMenuLite", icon='PIVOT_CURSOR') UseSeparator(self, context) - layout.menu("VIEW3D_MT_object_context_menu", text="Specials", icon='SOLO_OFF') - layout.menu("VIEW3D_MT_Camera_Options", icon='OUTLINER_OB_CAMERA') + layout.menu("VIEW3D_MT_object_collection", text = "Collections", icon='GROUP') UseSeparator(self, context) layout.operator_menu_enum("object.modifier_add", "type", icon='MODIFIER') - layout.operator_menu_enum("object.constraint_add", - "type", text="Add Constraint", icon='CONSTRAINT') UseSeparator(self, context) layout.operator("object.delete", text="Delete Object", icon='X') UseSeparator(self, context) layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT') - # Edit Lattice # +# Edit Lattice # if obj and obj.type == 'LATTICE' and obj.mode in {'EDIT'}: layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM') @@ -714,59 +569,48 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu): text="Animation", icon='PLAY') layout.operator("wm.toolbar", text="Tools", icon='TOOL_SETTINGS') layout.menu("SCREEN_MT_user_menu", text="Quick Favorites", icon='HEART') - UseSeparator(self, context) layout.menu("VIEW3D_MT_Object_Interactive_Other", icon='OBJECT_DATA') - layout.menu("VIEW3D_MT_view", icon='ZOOM_ALL') - layout.menu("VIEW3D_MT_Select_Edit_Lattice", - icon='RESTRICT_SELECT_OFF') UseSeparator(self, context) - layout.menu("VIEW3D_MT_TransformMenu", icon='EMPTY_ARROWS') - layout.menu("VIEW3D_MT_MirrorMenu", icon='MOD_MIRROR') - layout.menu("VIEW3D_MT_CursorMenu", icon='PIVOT_CURSOR') + layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL') + layout.menu("VIEW3D_MT_select_edit_lattice", + icon='RESTRICT_SELECT_OFF') UseSeparator(self, context) - layout.prop_menu_enum(settings, "proportional_edit", - icon="PROP_CON") - layout.prop_menu_enum(settings, "proportional_edit_falloff", - icon="SMOOTHCURVE") + layout.menu("VIEW3D_MT_TransformMenuLite", icon='EMPTY_ARROWS') + layout.menu("VIEW3D_MT_mirror", icon='MOD_MIRROR') + layout.menu("VIEW3D_MT_CursorMenuLite", icon='PIVOT_CURSOR') UseSeparator(self, context) layout.operator("lattice.make_regular") UseSeparator(self, context) layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT') - # Empty Object Mode # +# Empty Object Mode # if obj and obj.type == 'EMPTY' and obj.mode in {'OBJECT'}: layout.operator_context = 'INVOKE_REGION_WIN' layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM') + layout.operator("wm.toolbar", text="Tools", icon='TOOL_SETTINGS') layout.menu("VIEW3D_MT_Animation_Player", text="Animation", icon='PLAY') - layout.operator("wm.toolbar", text="Tools", icon='TOOL_SETTINGS') layout.menu("SCREEN_MT_user_menu", text="Quick Favorites", icon='HEART') UseSeparator(self, context) - layout.menu("VIEW3D_MT_view", icon='ZOOM_ALL') - layout.menu("VIEW3D_MT_Select_Object", icon='RESTRICT_SELECT_OFF') - UseSeparator(self, context) - layout.menu("VIEW3D_MT_AddMenu", icon='OBJECT_DATAMODE') - layout.menu("VIEW3D_MT_Object", icon='VIEW3D') + layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL') + layout.menu("VIEW3D_MT_select_object", icon='RESTRICT_SELECT_OFF') + layout.menu("VIEW3D_MT_add", icon='MESH_CUBE') + layout.menu("VIEW3D_MT_Camera_Options", icon='CAMERA_DATA') UseSeparator(self, context) + layout.menu("VIEW3D_MT_Object", icon='OBJECT_DATAMODE') layout.menu("VIEW3D_MT_TransformMenuLite", icon='EMPTY_ARROWS') - layout.menu("VIEW3D_MT_MirrorMenu", icon='MOD_MIRROR') layout.menu("VIEW3D_MT_CursorMenuLite", icon='PIVOT_CURSOR') UseSeparator(self, context) - layout.menu("VIEW3D_MT_ParentMenu", icon='PIVOT_ACTIVE') - layout.menu("VIEW3D_MT_GroupMenu", icon='GROUP') - UseSeparator(self, context) - layout.menu("VIEW3D_MT_object_context_menu", text="Specials", icon='SOLO_OFF') - layout.menu("VIEW3D_MT_Camera_Options", icon='OUTLINER_OB_CAMERA') + layout.menu("VIEW3D_MT_object_collection", text = "Collections", icon='GROUP') UseSeparator(self, context) - layout.operator_menu_enum("object.constraint_add", - "type", text="Add Constraint", icon='CONSTRAINT') + layout.operator_menu_enum("object.modifier_add", "type", icon='MODIFIER') UseSeparator(self, context) layout.operator("object.delete", text="Delete Object", icon='X') UseSeparator(self, context) layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT') - # Speaker Object Mode # +# Speaker Object Mode # if obj and obj.type == 'SPEAKER' and obj.mode in {'OBJECT'}: layout.operator_context = 'INVOKE_REGION_WIN' @@ -776,26 +620,21 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu): layout.operator("wm.toolbar", text="Tools", icon='TOOL_SETTINGS') layout.menu("SCREEN_MT_user_menu", text="Quick Favorites", icon='HEART') UseSeparator(self, context) - layout.menu("VIEW3D_MT_view", icon='ZOOM_ALL') - layout.menu("VIEW3D_MT_Select_Object", icon='RESTRICT_SELECT_OFF') + layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL') + layout.menu("VIEW3D_MT_select_object", icon='RESTRICT_SELECT_OFF') + layout.menu("VIEW3D_MT_add", icon='MESH_CUBE') UseSeparator(self, context) - layout.menu("VIEW3D_MT_AddMenu", icon='OBJECT_DATAMODE') layout.menu("VIEW3D_MT_Object", icon='VIEW3D') - UseSeparator(self, context) layout.menu("VIEW3D_MT_TransformMenuLite", icon='EMPTY_ARROWS') layout.menu("VIEW3D_MT_CursorMenuLite", icon='PIVOT_CURSOR') UseSeparator(self, context) - layout.menu("VIEW3D_MT_ParentMenu", icon='PIVOT_ACTIVE') - layout.menu("VIEW3D_MT_GroupMenu", icon='GROUP') - UseSeparator(self, context) - layout.operator_menu_enum("object.constraint_add", - "type", text="Add Constraint", icon='CONSTRAINT') + layout.menu("VIEW3D_MT_object_collection", text = "Collections", icon='GROUP') UseSeparator(self, context) layout.operator("object.delete", text="Delete Object", icon='X') UseSeparator(self, context) layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT') - # Particle Menu # +# Particle Menu # if obj and context.mode == 'PARTICLE': layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM') @@ -803,16 +642,16 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu): text="Animation", icon='PLAY') layout.operator("wm.toolbar", text="Tools", icon='TOOL_SETTINGS') layout.menu("SCREEN_MT_user_menu", text="Quick Favorites", icon='HEART') - UseSeparator(self, context) layout.menu("VIEW3D_MT_InteractiveMode", icon='VIEW3D') - layout.menu("VIEW3D_MT_view", icon='ZOOM_ALL') + UseSeparator(self, context) + layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL') layout.menu("VIEW3D_MT_Select_Particle", icon='RESTRICT_SELECT_OFF') - layout.menu("VIEW3D_MT_Selection_Mode_Particle", + layout.menu("VIEW3D_MT_select_particle", text="Select and Display Mode", icon='PARTICLE_PATH') UseSeparator(self, context) layout.menu("VIEW3D_MT_TransformMenu", icon='EMPTY_ARROWS') - layout.menu("VIEW3D_MT_MirrorMenu", icon='MOD_MIRROR') + layout.menu("VIEW3D_MT_mirror", icon='MOD_MIRROR') layout.menu("VIEW3D_MT_CursorMenuLite", icon='PIVOT_CURSOR') UseSeparator(self, context) # layout.prop_menu_enum(settings, "proportional_edit", @@ -827,42 +666,35 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu): UseSeparator(self, context) layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT') - # Grease Pencil Object Mode # +# Grease Pencil Object Mode # if obj and obj.type == 'GPENCIL' and obj.mode in {'OBJECT'}: + layout.operator_context = 'INVOKE_REGION_WIN' layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM') + layout.operator("wm.toolbar", text="Tools", icon='TOOL_SETTINGS') layout.menu("VIEW3D_MT_Animation_Player", text="Animation", icon='PLAY') - layout.operator("wm.toolbar", text="Tools", icon='TOOL_SETTINGS') layout.menu("SCREEN_MT_user_menu", text="Quick Favorites", icon='HEART') - UseSeparator(self, context) layout.menu("VIEW3D_MT_interactive_mode_gpencil", icon='EDITMODE_HLT') - layout.menu("VIEW3D_MT_view", icon='ZOOM_ALL') - layout.menu("VIEW3D_MT_Select_Object", icon='RESTRICT_SELECT_OFF') UseSeparator(self, context) - layout.menu("VIEW3D_MT_AddMenu", icon='OBJECT_DATAMODE') - layout.menu("VIEW3D_MT_Object", icon='VIEW3D') + layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL') + layout.menu("VIEW3D_MT_select_object", icon='RESTRICT_SELECT_OFF') + layout.menu("VIEW3D_MT_add", icon='MESH_CUBE') + layout.menu("VIEW3D_MT_Camera_Options", icon='CAMERA_DATA') UseSeparator(self, context) + layout.menu("VIEW3D_MT_Object", icon='OBJECT_DATAMODE') layout.menu("VIEW3D_MT_TransformMenu", icon='EMPTY_ARROWS') - layout.menu("VIEW3D_MT_MirrorMenu", icon='MOD_MIRROR') layout.menu("VIEW3D_MT_CursorMenu", icon='PIVOT_CURSOR') UseSeparator(self, context) - layout.menu("VIEW3D_MT_ParentMenu", icon='PIVOT_ACTIVE') - layout.menu("VIEW3D_MT_GroupMenu", icon='GROUP') - UseSeparator(self, context) - layout.menu("VIEW3D_MT_object_context_menu", text="Specials", icon='SOLO_OFF') - layout.menu("VIEW3D_MT_Camera_Options", icon='OUTLINER_OB_CAMERA') + layout.menu("VIEW3D_MT_object_collection", text = "Collections", icon='GROUP') UseSeparator(self, context) - layout.operator_menu_enum("object.gpencil_modifier_add", "type", icon='MODIFIER') - layout.operator_menu_enum("object.shaderfx_add", "type", icon ='SHADERFX') - layout.operator_menu_enum("object.constraint_add", - "type", text="Add Constraint", icon='CONSTRAINT') + layout.operator_menu_enum("object.modifier_add", "type", icon='MODIFIER') UseSeparator(self, context) layout.operator("object.delete", text="Delete Object", icon='X') UseSeparator(self, context) layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT') - # Grease Pencil Edit Mode # +# Grease Pencil Edit Mode # if obj and obj.type == 'GPENCIL' and obj.mode in {'EDIT_GPENCIL'}: layout.operator_context = 'INVOKE_REGION_WIN' @@ -873,12 +705,10 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu): layout.menu("SCREEN_MT_user_menu", text="Quick Favorites", icon='HEART') UseSeparator(self, context) layout.menu("VIEW3D_MT_interactive_mode_gpencil", icon='EDITMODE_HLT') - layout.menu("VIEW3D_MT_view", icon='ZOOM_ALL') + layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL') layout.menu("VIEW3D_MT_select_gpencil", icon='RESTRICT_SELECT_OFF') layout.menu("VIEW3D_MT_edit_gpencil", icon='GREASEPENCIL') UseSeparator(self, context) - layout.menu("VIEW3D_MT_AddMenu", icon='OBJECT_DATAMODE') - UseSeparator(self, context) layout.operator("view3d.snap_cursor_to_center", text="Cursor to World Origin", icon='CURSOR') layout.operator("view3d.snap_cursor_to_grid", @@ -886,7 +716,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu): UseSeparator(self, context) layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT') - # Grease Pencil Sculpt Mode # +# Grease Pencil Sculpt Mode # if obj and obj.type == 'GPENCIL' and obj.mode in {'SCULPT_GPENCIL'}: layout.operator_context = 'INVOKE_REGION_WIN' @@ -897,10 +727,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu): layout.menu("SCREEN_MT_user_menu", text="Quick Favorites", icon='HEART') UseSeparator(self, context) layout.menu("VIEW3D_MT_interactive_mode_gpencil", icon='EDITMODE_HLT') - layout.menu("VIEW3D_MT_view", icon='ZOOM_ALL') - layout.menu("VIEW3D_MT_select_gpencil", icon='RESTRICT_SELECT_OFF') - UseSeparator(self, context) - layout.menu("VIEW3D_MT_AddMenu", icon='OBJECT_DATAMODE') + layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL') UseSeparator(self, context) layout.operator("view3d.snap_cursor_to_center", text="Cursor to World Origin", icon='CURSOR') @@ -909,7 +736,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu): UseSeparator(self, context) layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT') - # Grease Pencil Paint Mode # +# Grease Pencil Paint Mode # if obj and obj.type == 'GPENCIL' and obj.mode in {'PAINT_GPENCIL'}: layout.operator_context = 'INVOKE_REGION_WIN' @@ -920,11 +747,9 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu): layout.menu("SCREEN_MT_user_menu", text="Quick Favorites", icon='HEART') UseSeparator(self, context) layout.menu("VIEW3D_MT_interactive_mode_gpencil", icon='EDITMODE_HLT') - layout.menu("VIEW3D_MT_view", icon='ZOOM_ALL') + layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL') layout.menu("VIEW3D_MT_paint_gpencil", icon='RESTRICT_SELECT_OFF') UseSeparator(self, context) - layout.menu("VIEW3D_MT_AddMenu", icon='OBJECT_DATAMODE') - UseSeparator(self, context) layout.operator("view3d.snap_cursor_to_center", text="Cursor to World Origin", icon='CURSOR') layout.operator("view3d.snap_cursor_to_grid", @@ -932,7 +757,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu): UseSeparator(self, context) layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT') - # Grease Pencil Weight Mode # +# Grease Pencil Weight Mode # if obj and obj.type == 'GPENCIL' and obj.mode in {'WEIGHT_GPENCIL'}: layout.operator_context = 'INVOKE_REGION_WIN' @@ -943,14 +768,12 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu): layout.menu("SCREEN_MT_user_menu", text="Quick Favorites", icon='HEART') UseSeparator(self, context) layout.menu("VIEW3D_MT_interactive_mode_gpencil", icon='EDITMODE_HLT') - layout.menu("VIEW3D_MT_view", icon='ZOOM_ALL') + layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL') layout.menu("VIEW3D_MT_weight_gpencil", icon="GPBRUSH_WEIGHT") UseSeparator(self, context) - layout.menu("VIEW3D_MT_AddMenu", icon='OBJECT_DATAMODE') - UseSeparator(self, context) layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT') - # Light Probe Menu # +# Light Probe Menu # if obj and obj.type == 'LIGHT_PROBE': layout.operator_context = 'INVOKE_REGION_WIN' @@ -960,22 +783,67 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu): layout.operator("wm.toolbar", text="Tools", icon='TOOL_SETTINGS') layout.menu("SCREEN_MT_user_menu", text="Quick Favorites", icon='HEART') UseSeparator(self, context) - layout.menu("INFO_MT_area", icon='WORKSPACE') - layout.menu("VIEW3D_MT_view_viewpoint", icon='ZOOM_ALL') - layout.menu("VIEW3D_MT_view_navigation", icon='PIVOT_BOUNDBOX') + layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL') + layout.menu("VIEW3D_MT_select_object", icon='RESTRICT_SELECT_OFF') + layout.menu("VIEW3D_MT_add", icon='MESH_CUBE') UseSeparator(self, context) - layout.menu("VIEW3D_MT_AddMenu", icon='OBJECT_DATAMODE') + layout.menu("VIEW3D_MT_Object", icon='OBJECT_DATAMODE') + layout.menu("VIEW3D_MT_TransformMenuLite", icon='EMPTY_ARROWS') + layout.menu("VIEW3D_MT_CursorMenuLite", icon='PIVOT_CURSOR') UseSeparator(self, context) - layout.operator("view3d.snap_cursor_to_center", - text="Cursor to World Origin", icon='CURSOR') - layout.operator("view3d.snap_cursor_to_grid", - text="Cursor to Grid", icon='SNAP_GRID') + layout.menu("VIEW3D_MT_object_collection", text = "Collections", icon='GROUP') UseSeparator(self, context) layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT') UseSeparator(self, context) layout.prop(view, "show_region_toolbar", icon='MENU_PANEL') layout.prop(view, "show_region_ui", icon='MENU_PANEL') +# Text Object Mode # + if obj and obj.type == 'FONT' and obj.mode in {'OBJECT'}: + + layout.operator_context = 'INVOKE_REGION_WIN' + layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM') + layout.operator("wm.toolbar", text="Tools", icon='TOOL_SETTINGS') + layout.menu("VIEW3D_MT_Animation_Player", + text="Animation", icon='PLAY') + layout.menu("SCREEN_MT_user_menu", text="Quick Favorites", icon='HEART') + layout.menu("VIEW3D_MT_Object_Interactive_Other", icon='OBJECT_DATA') + UseSeparator(self, context) + layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL') + layout.menu("VIEW3D_MT_select_object", icon='RESTRICT_SELECT_OFF') + layout.menu("VIEW3D_MT_add", icon='MESH_CUBE') + layout.menu("VIEW3D_MT_Camera_Options", icon='CAMERA_DATA') + UseSeparator(self, context) + layout.menu("VIEW3D_MT_Object", icon='OBJECT_DATAMODE') + layout.menu("VIEW3D_MT_TransformMenu", icon='EMPTY_ARROWS') + layout.menu("VIEW3D_MT_CursorMenu", icon='PIVOT_CURSOR') + UseSeparator(self, context) + layout.menu("VIEW3D_MT_object_collection", text = "Collections", icon='GROUP') + UseSeparator(self, context) + layout.operator_menu_enum("object.modifier_add", "type", icon='MODIFIER') + UseSeparator(self, context) + layout.operator("object.delete", text="Delete Object", icon='X') + UseSeparator(self, context) + layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT') + + +# Text Edit Mode +def menu_func(self, context): + layout = self.layout + + layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL') + layout.menu("VIEW3D_MT_select_edit_text", icon='VIEW3D') + layout.separator() + layout.operator_context = 'INVOKE_REGION_WIN' + layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM') + layout.menu("VIEW3D_MT_Animation_Player", + text="Animation", icon='PLAY') + layout.menu("SCREEN_MT_user_menu", text="Quick Favorites", icon='HEART') + layout.operator("object.editmode_toggle", text="Enter Object Mode", + icon='OBJECT_DATA') + layout.separator() + layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT') + # Preferences utility functions @@ -1017,6 +885,7 @@ class VIEW3D_MT_Space_Dynamic_Menu_Pref(AddonPreferences): row.prop(self, "use_separators", toggle=True) row.prop(self, "use_brushes_lists", toggle=True) + # List The Classes # classes = ( @@ -1031,17 +900,18 @@ def register(): for cls in classes: bpy.utils.register_class(cls) + bpy.types.VIEW3D_MT_edit_text_context_menu.append(menu_func) + object_menus.register() edit_mesh.register() transform_menus.register() - select_menus.register() view_menus.register() armature_menus.register() curve_menus.register() snap_origin_cursor.register() - sculpt_brush_paint.register() animation_menus.register() + wm = bpy.context.window_manager kc = wm.keyconfigs.addon if kc: @@ -1065,17 +935,17 @@ def unregister(): object_menus.unregister() edit_mesh.unregister() transform_menus.unregister() - select_menus.unregister() view_menus.unregister() armature_menus.unregister() curve_menus.unregister() snap_origin_cursor.unregister() - sculpt_brush_paint.unregister() animation_menus.unregister() + for cls in reversed(classes): bpy.utils.unregister_class(cls) + bpy.types.VIEW3D_MT_edit_text_context_menu.remove(menu_func) if __name__ == "__main__": register() diff --git a/space_view3d_spacebar_menu/animation_menus.py b/space_view3d_spacebar_menu/animation_menus.py index ece261f7..7dadffc6 100644 --- a/space_view3d_spacebar_menu/animation_menus.py +++ b/space_view3d_spacebar_menu/animation_menus.py @@ -31,20 +31,6 @@ from bpy.props import ( from bl_ui.properties_paint_common import UnifiedPaintPanel -# Animation Menus -class VIEW3D_MT_KeyframeMenu(Menu): - bl_label = "Keyframe" - - def draw(self, context): - layout = self.layout - layout.operator("anim.keyframe_insert_menu", - text="Insert Keyframe...") - layout.operator("anim.keyframe_delete_v3d", - text="Delete Keyframe...") - layout.operator("anim.keying_set_active_set", - text="Change Keying Set...") - - # Animation Player (Thanks to marvin.k.breuer) # class VIEW3D_MT_Animation_Player(Menu): @@ -67,14 +53,13 @@ class VIEW3D_MT_Animation_Player(Menu): layout.operator("screen.frame_jump", text="Jump REW", icon='REW').end = False layout.separator() - layout.menu("VIEW3D_MT_KeyframeMenu", text="Keyframes", icon='DECORATE_ANIMATE') + layout.menu("VIEW3D_MT_object_animation", text="Keyframes", icon='DECORATE_ANIMATE') # List The Classes # classes = ( - VIEW3D_MT_KeyframeMenu, VIEW3D_MT_Animation_Player, ) diff --git a/space_view3d_spacebar_menu/curve_menus.py b/space_view3d_spacebar_menu/curve_menus.py index d06d7bb5..c9e72ff0 100644 --- a/space_view3d_spacebar_menu/curve_menus.py +++ b/space_view3d_spacebar_menu/curve_menus.py @@ -27,6 +27,7 @@ from bpy.props import ( BoolProperty, StringProperty, ) + from .object_menus import * @@ -39,73 +40,33 @@ class VIEW3D_MT_Edit_Curve(Menu): toolsettings = context.tool_settings - layout.operator("curve.extrude_move") - layout.operator("curve.spin") + layout.operator_menu_enum("curve.spline_type_set", "type") + layout.menu("VIEW3D_MT_mirror") + layout.operator("curve.make_segment") + layout.menu("VIEW3D_MT_edit_curve_segments") + layout.separator() + layout.operator("curve.duplicate_move") layout.operator("curve.split") layout.operator("curve.separate") - layout.operator("curve.make_segment") layout.operator("curve.cyclic_toggle") + layout.operator("curve.spin") layout.separator() - layout.operator("curve.delete", text="Delete...") + + layout.menu("VIEW3D_MT_edit_curve_showhide") + layout.menu("VIEW3D_MT_edit_curve_clean") layout.separator() - layout.menu("VIEW3D_MT_edit_curve_segments") + # layout.prop_menu_enum(toolsettings, "proportional_edit", # icon="PROP_CON") layout.prop_menu_enum(toolsettings, "proportional_edit_falloff", icon="SMOOTHCURVE") - layout.menu("VIEW3D_MT_edit_curve_showhide") - - -class VIEW3D_MT_EditCurveCtrlpoints(Menu): - bl_label = "Control Points" - - def draw(self, context): - layout = self.layout - - edit_object = context.edit_object - - if edit_object.type == 'CURVE': - layout.operator("transform.transform").mode = 'TILT' - layout.operator("curve.tilt_clear") - layout.operator("curve.separate") - layout.operator_menu_enum("curve.handle_type_set", "type") - layout.menu("VIEW3D_MT_hook") - - -class VIEW3D_MT_EditCurveSegments(Menu): - bl_label = "Curve Segments" - - def draw(self, context): - layout = self.layout - layout.operator("curve.subdivide") - layout.operator("curve.switch_direction") - - -class VIEW3D_MT_EditCurveSpecials(Menu): - bl_label = "Specials" - - def draw(self, context): - layout = self.layout - layout.operator("curve.subdivide") - layout.separator() - layout.operator("curve.switch_direction") - layout.operator("curve.spline_weight_set") - layout.operator("curve.radius_set") - layout.separator() - layout.operator("curve.smooth") - layout.operator("curve.smooth_weight") - layout.operator("curve.smooth_radius") - layout.operator("curve.smooth_tilt") # List The Classes # classes = ( VIEW3D_MT_Edit_Curve, - VIEW3D_MT_EditCurveCtrlpoints, - VIEW3D_MT_EditCurveSegments, - VIEW3D_MT_EditCurveSpecials, ) diff --git a/space_view3d_spacebar_menu/edit_mesh.py b/space_view3d_spacebar_menu/edit_mesh.py index 9847f63d..eff16c0d 100644 --- a/space_view3d_spacebar_menu/edit_mesh.py +++ b/space_view3d_spacebar_menu/edit_mesh.py @@ -32,95 +32,8 @@ from .object_menus import * from .snap_origin_cursor import * -# ********** Edit Mirror ********** -class VIEW3D_MT_MirrorMenuEM(Menu): - bl_label = "Mirror" - - def draw(self, context): - layout = self.layout - - props = layout.operator("transform.mirror", text="X Local") - props.constraint_axis = (True, False, False) - props.orient_type = 'LOCAL' - props = layout.operator("transform.mirror", text="Y Local") - props.constraint_axis = (False, True, False) - props.orient_type = 'LOCAL' - props = layout.operator("transform.mirror", text="Z Local") - props.constraint_axis = (False, False, True) - props.orient_type = 'LOCAL' - layout.separator() - layout.operator("object.vertex_group_mirror") - - -# ********** Normals / Auto Smooth Menu ********** -# Thanks to marvin.k.breuer for the Autosmooth part of the menu -class VIEW3D_MT_AutoSmooth(Menu): - bl_label = "Normals / Auto Smooth" - - def draw(self, context): - layout = self.layout - obj = context.object - obj_data = context.active_object.data - - # moved the VIEW3D_MT_edit_mesh_normals contents here under an Edit mode check - if obj and obj.type == 'MESH' and obj.mode in {'EDIT'}: - layout.operator("mesh.normals_make_consistent", - text="Recalculate Outside").inside = False - layout.operator("mesh.normals_make_consistent", - text="Recalculate Inside").inside = True - layout.operator("mesh.flip_normals") - layout.separator() - - layout.separator() - layout.prop(obj_data, "use_auto_smooth", text="Normals: Auto Smooth") - - # Auto Smooth Angle - two tab spaces to align it with the rest of the menu - layout.prop(obj_data, "auto_smooth_angle", - text=" Auto Smooth Angle") - - # Edit Mode Menu's # -# ********** Edit Mesh ********** -class VIEW3D_MT_Edit_Mesh(Menu): - bl_label = "Mesh" - - def draw(self, context): - layout = self.layout - toolsettings = context.tool_settings - view = context.space_data - - layout.menu("VIEW3D_MT_edit_mesh_vertices", icon='VERTEXSEL') - layout.menu("VIEW3D_MT_edit_mesh_edges", icon='EDGESEL') - layout.menu("VIEW3D_MT_edit_mesh_faces", icon='FACESEL') - layout.separator() - layout.operator("mesh.duplicate_move") - layout.separator() - layout.menu("VIEW3D_MT_edit_mesh_clean", icon='AUTO') -# layout.prop(view, "use_occlude_geometry") - layout.separator() - layout.menu("VIEW3D_MT_AutoSmooth", icon='META_DATA') - layout.operator("mesh.loopcut_slide", - text="Loopcut", icon='UV_EDGESEL') - layout.separator() - layout.operator("mesh.symmetrize") - layout.operator("mesh.symmetry_snap") - layout.separator() - layout.operator("mesh.bisect") - layout.operator_menu_enum("mesh.sort_elements", "type", text="Sort Elements...") - layout.separator() -# layout.prop_menu_enum(toolsettings, "proportional_edit") - layout.prop_menu_enum(toolsettings, "proportional_edit_falloff") - layout.separator() - - layout.prop(toolsettings, "use_mesh_automerge") - # Double Threshold - two tab spaces to align it with the rest of the menu - layout.prop(toolsettings, "double_threshold", text="Double Threshold") - - layout.separator() - layout.menu("VIEW3D_MT_edit_mesh_showhide") - - # ********** Edit Multiselect ********** class VIEW3D_MT_Edit_Multi(Menu): bl_label = "Mode Select" @@ -167,156 +80,6 @@ class VIEW3D_MT_EditM_Edge(Menu): layout.operator("mesh.region_to_loop") -# ********** Edit Mesh Cursor ********** -class VIEW3D_MT_EditCursorMenu(Menu): - bl_label = "Snap Cursor" - - def draw(self, context): - layout = self.layout - layout.operator_context = 'INVOKE_REGION_WIN' - layout.operator("object.setorigintoselected", - text="Origin to Selected V/F/E") - layout.separator() - layout.menu("VIEW3D_MT_Snap_Origin") - layout.menu("VIEW3D_MT_Snap_Context") - layout.separator() - layout.operator("view3d.snap_cursor_to_selected", - text="Cursor to Selected") - layout.operator("view3d.snap_cursor_to_center", - text="Cursor to World Origin") - layout.operator("view3d.snap_cursor_to_grid", - text="Cursor to Grid") - layout.operator("view3d.snap_cursor_to_active", - text="Cursor to Active") - layout.operator("view3d.snap_cursor_to_edge_intersection", - text="Cursor to Edge Intersection") - layout.separator() - layout.operator("view3d.snap_selected_to_cursor", - text="Selection to Cursor").use_offset = False - layout.operator("view3d.snap_selected_to_cursor", - text="Selection to Cursor (Keep Offset)").use_offset = True - layout.operator("view3d.snap_selected_to_grid", - text="Selection to Grid") - - -# ********** Edit Mesh UV ********** -class VIEW3D_MT_UV_Map(Menu): - bl_label = "UV Mapping" - - def draw(self, context): - layout = self.layout - layout.operator("uv.unwrap") - layout.separator() - layout.operator_context = 'INVOKE_DEFAULT' - layout.operator("uv.smart_project") - layout.operator("uv.lightmap_pack") - layout.operator("uv.follow_active_quads") - layout.operator_context = 'EXEC_REGION_WIN' - layout.operator("uv.cube_project") - layout.operator("uv.cylinder_project") - layout.operator("uv.sphere_project") - layout.operator_context = 'INVOKE_REGION_WIN' - layout.separator() - layout.operator("uv.project_from_view").scale_to_bounds = False - layout.operator("uv.project_from_view", text="Project from View (Bounds)").scale_to_bounds = True - layout.separator() - layout.operator("uv.reset") - - -# ********** Edit Mesh Transform ********** -class VIEW3D_MT_TransformMenuEdit(Menu): - bl_label = "Transform" - - def draw(self, context): - layout = self.layout - layout.operator("transform.translate", text="Move") - layout.operator("transform.rotate", text="Rotate") - layout.operator("transform.resize", text="Scale") - layout.separator() - layout.operator("transform.tosphere", text="To Sphere") - layout.operator("transform.shear", text="Shear") - layout.operator("transform.bend", text="Bend") - layout.operator("transform.push_pull", text="Push/Pull") - layout.operator("transform.vertex_warp", text="Warp") - layout.operator("transform.vertex_random", text="Randomize") - layout.separator() - layout.operator("transform.translate", text="Move Texture Space").texture_space = True - layout.operator("transform.resize", text="Scale Texture Space").texture_space = True - layout.separator() - layout.operator_context = 'EXEC_REGION_WIN' - layout.operator("transform.transform", - text="Align to Transform Orientation").mode = 'ALIGN' - layout.operator_context = 'EXEC_AREA' - layout.operator("object.origin_set", - text="Geometry to Origin").type = 'GEOMETRY_ORIGIN' - - -# Edit Select # -class VIEW3D_MT_Select_Edit_Mesh(Menu): - bl_label = "Select" - - def draw(self, context): - layout = self.layout - layout.operator("view3d.select_box") - layout.operator("view3d.select_circle") - layout.separator() - layout.operator("mesh.select_all").action = 'TOGGLE' - layout.operator("mesh.select_all", text="Inverse").action = 'INVERT' - layout.operator("mesh.select_linked", text="Linked") - layout.operator("mesh.faces_select_linked_flat", - text="Linked Flat Faces") - layout.operator("mesh.select_random", text="Random") - layout.operator("mesh.select_nth", text="Every N Number of Verts") - layout.separator() - layout.menu("VIEW3D_MT_Edit_Mesh_Select_Trait") - layout.menu("VIEW3D_MT_Edit_Mesh_Select_Similar") - layout.menu("VIEW3D_MT_Edit_Mesh_Select_More_Less") - layout.separator() - layout.operator("mesh.select_mirror", text="Mirror") - layout.operator("mesh.edges_select_sharp", text="Sharp Edges") - layout.operator("mesh.select_axis", text="Side of Active") - layout.operator("mesh.shortest_path_select", text="Shortest Path") - layout.separator() - layout.operator("mesh.loop_multi_select", text="Edge Loops").ring = False - layout.operator("mesh.loop_multi_select", text="Edge Rings").ring = True - layout.operator("mesh.loop_to_region") - layout.operator("mesh.region_to_loop") - - -class VIEW3D_MT_Edit_Mesh_Select_Similar(Menu): - bl_label = "Select Similar" - - def draw(self, context): - layout = self.layout - layout.operator_enum("mesh.select_similar", "type") - layout.operator("mesh.select_similar_region", text="Face Regions") - - -class VIEW3D_MT_Edit_Mesh_Select_Trait(Menu): - bl_label = "Select All by Trait" - - def draw(self, context): - layout = self.layout - if context.scene.tool_settings.mesh_select_mode[2] is False: - layout.operator("mesh.select_non_manifold", text="Non Manifold") - layout.operator("mesh.select_loose", text="Loose Geometry") - layout.operator("mesh.select_interior_faces", text="Interior Faces") - layout.operator("mesh.select_face_by_sides", text="By Number of Verts") - layout.operator("mesh.select_ungrouped", text="Ungrouped Verts") - - -class VIEW3D_MT_Edit_Mesh_Select_More_Less(Menu): - bl_label = "Select More/Less" - - def draw(self, context): - layout = self.layout - layout.operator("mesh.select_more", text="More") - layout.operator("mesh.select_less", text="Less") - layout.separator() - layout.operator("mesh.select_next_item", text="Next Active") - layout.operator("mesh.select_prev_item", text="Previous Active") - - # multiple edit select modes. class VIEW3D_OT_selecteditVertex(Operator): bl_idname = "selectedit.vertex" @@ -433,21 +196,26 @@ class VIEW3D_OT_selecteditVertsEdgesFaces(Operator): return {'FINISHED'} +# ********** Normals / Auto Smooth Menu ********** +# Thanks to marvin.k.breuer for the Autosmooth part of the menu + +def menu_func(self, context): + layout = self.layout + obj = context.object + obj_data = context.active_object.data + layout.separator() + layout.prop(obj_data, "use_auto_smooth", text="Normals: Auto Smooth") + + # Auto Smooth Angle - two tab spaces to align it with the rest of the menu + layout.prop(obj_data, "auto_smooth_angle", + text=" Auto Smooth Angle") + + # List The Classes # classes = ( - VIEW3D_MT_MirrorMenuEM, - VIEW3D_MT_AutoSmooth, - VIEW3D_MT_Edit_Mesh, VIEW3D_MT_Edit_Multi, VIEW3D_MT_EditM_Edge, - VIEW3D_MT_EditCursorMenu, - VIEW3D_MT_UV_Map, - VIEW3D_MT_TransformMenuEdit, - VIEW3D_MT_Select_Edit_Mesh, - VIEW3D_MT_Edit_Mesh_Select_Similar, - VIEW3D_MT_Edit_Mesh_Select_Trait, - VIEW3D_MT_Edit_Mesh_Select_More_Less, VIEW3D_OT_selecteditVertex, VIEW3D_OT_selecteditEdge, VIEW3D_OT_selecteditFace, @@ -463,6 +231,7 @@ def register(): for cls in classes: bpy.utils.register_class(cls) + bpy.types.VIEW3D_MT_edit_mesh_normals.append(menu_func) # Unregister Classes & Hotkeys # def unregister(): @@ -470,6 +239,7 @@ def unregister(): for cls in reversed(classes): bpy.utils.unregister_class(cls) + bpy.types.VIEW3D_MT_edit_mesh_normals.remove(menu_func) if __name__ == "__main__": register() diff --git a/space_view3d_spacebar_menu/object_menus.py b/space_view3d_spacebar_menu/object_menus.py index 5c3ef0ac..f6b0ba29 100644 --- a/space_view3d_spacebar_menu/object_menus.py +++ b/space_view3d_spacebar_menu/object_menus.py @@ -30,7 +30,8 @@ from bpy.props import ( from bl_ui.properties_paint_common import UnifiedPaintPanel - +from . edit_mesh import * +from . view_menus import * # Object Menus # # ********** Object Menu ********** @@ -41,119 +42,39 @@ class VIEW3D_MT_Object(Menu): def draw(self, context): layout = self.layout view = context.space_data - is_local_view = (view.local_view is not None) - layout.operator("object.delete", text="Delete...").use_global = False - layout.separator() + layout.menu("VIEW3D_MT_mirror") layout.menu("VIEW3D_MT_object_parent") layout.menu("VIEW3D_MT_Duplicate") layout.operator("object.join") - - if is_local_view: - layout.operator_context = 'EXEC_REGION_WIN' - layout.operator("object.move_to_layer", text="Move out of Local View") - layout.operator_context = 'INVOKE_REGION_WIN' - - layout.menu("VIEW3D_MT_make_links", text="Make Links...") - layout.menu("VIEW3D_MT_Object_Data_Link") - layout.separator() - layout.menu("VIEW3D_MT_AutoSmooth", icon='ALIASED') - layout.separator() - layout.menu("VIEW3D_MT_object_constraints") - layout.menu("VIEW3D_MT_object_track") - layout.menu("VIEW3D_MT_object_animation") + layout.menu("VIEW3D_MT_make_links", text="Make Links") + layout.menu("VIEW3D_MT_object_relations") layout.separator() - layout.menu("VIEW3D_MT_object_showhide") - layout.separator() - layout.operator_menu_enum("object.convert", "target") - - -# ********** Add Menu ********** -class VIEW3D_MT_AddMenu(Menu): - bl_label = "Add Object" - - def draw(self, context): - layout = self.layout - layout.operator_context = 'EXEC_REGION_WIN' - layout.menu("VIEW3D_MT_mesh_add", text="Add Mesh", - icon='OUTLINER_OB_MESH') - layout.menu("VIEW3D_MT_curve_add", text="Add Curve", - icon='OUTLINER_OB_CURVE') - layout.menu("VIEW3D_MT_surface_add", text="Add Surface", - icon='OUTLINER_OB_SURFACE') - layout.operator_menu_enum("object.metaball_add", "type", - icon='OUTLINER_OB_META') - layout.operator("object.text_add", text="Add Text", - icon='OUTLINER_OB_FONT') - layout.operator_menu_enum("object.gpencil_add", "type", text="Grease Pencil", icon='OUTLINER_OB_GREASEPENCIL') - layout.separator() - layout.menu("VIEW3D_MT_armature_add", text="Add Armature", - icon='OUTLINER_OB_ARMATURE') - layout.operator("object.add", text="Lattice", - icon='OUTLINER_OB_LATTICE').type = 'LATTICE' - layout.separator() + ob = context.active_object + if ob and ob.type == 'GPENCIL' and context.gpencil_data: + layout.operator_menu_enum("gpencil.convert", "type", text="Convert to") + else: + layout.operator_menu_enum("object.convert", "target") - layout.operator_menu_enum("object.empty_add", "type", text="Empty", icon='OUTLINER_OB_EMPTY') - layout.menu("VIEW3D_MT_image_add", text="Image", icon='OUTLINER_OB_IMAGE') + layout.menu("VIEW3D_MT_object_showhide") layout.separator() - layout.operator_menu_enum("object.light_add", "type", - icon="OUTLINER_OB_LIGHT") - layout.menu("VIEW3D_MT_lightprobe_add", icon='OUTLINER_OB_LIGHTPROBE') - layout.separator() - - layout.operator("object.camera_add", text="Camera", - icon='OUTLINER_OB_CAMERA') + layout.menu("VIEW3D_MT_object_constraints") + layout.menu("VIEW3D_MT_object_track") layout.separator() - layout.operator("object.speaker_add", text="Speaker", icon='OUTLINER_OB_SPEAKER') + layout.menu("VIEW3D_MT_object_rigid_body") + layout.menu("VIEW3D_MT_object_quick_effects") layout.separator() - layout.operator_menu_enum("object.effector_add", "type", - text="Force Field", - icon='FORCE_FORCE') - layout.menu("VIEW3D_MT_object_quick_effects", text="Quick Effects", icon='PARTICLES') + layout.operator("view3d.copybuffer", text="Copy Objects", icon='COPYDOWN') + layout.operator("view3d.pastebuffer", text="Paste Objects", icon='PASTEDOWN') layout.separator() - has_collections = bool(bpy.data.collections) - col = layout.column() - col.enabled = has_collections - - if not has_collections or len(bpy.data.collections) > 10: - col.operator_context = 'INVOKE_REGION_WIN' - col.operator( - "object.collection_instance_add", - text="Collection Instance..." if has_collections else "No Collections to Instance", - icon='OUTLINER_OB_GROUP_INSTANCE', - ) - else: - col.operator_menu_enum( - "object.collection_instance_add", - "collection", - text="Collection Instance", - icon='OUTLINER_OB_GROUP_INSTANCE', - ) - - -# ********** Object Mirror ********** -class VIEW3D_MT_MirrorMenu(Menu): - bl_label = "Mirror" - - def draw(self, context): - layout = self.layout - layout.operator("transform.mirror", text="Interactive Mirror") - layout.separator() - layout.operator_context = 'INVOKE_REGION_WIN' - props = layout.operator("transform.mirror", text="X Global") - props.constraint_axis = (True, False, False) - props.orient_type = 'GLOBAL' - props = layout.operator("transform.mirror", text="Y Global") - props.constraint_axis = (False, True, False) - props.orient_type = 'GLOBAL' - props = layout.operator("transform.mirror", text="Z Global") - props.constraint_axis = (False, False, True) - props.orient_type = 'GLOBAL' + layout.operator_context = 'EXEC_DEFAULT' + layout.operator("object.delete", text="Delete").use_global = False + layout.operator("object.delete", text="Delete Global").use_global = True # ********** Object Interactive Mode ********** @@ -223,41 +144,6 @@ class VIEW3D_MT_Interactive_Mode_GPencil(Menu): layout.operator(VIEW3D_OT_SetObjectMode.bl_idname, text="Draw", icon="GREASEPENCIL").mode = "PAINT_GPENCIL" layout.operator(VIEW3D_OT_SetObjectMode.bl_idname, text="Weight Paint", icon="WPAINT_HLT").mode = "WEIGHT_GPENCIL" -# currently unused -class VIEW3D_MT_Edit_Gpencil(Menu): - bl_label = "GPencil" - - def draw(self, context): - toolsettings = context.tool_settings - layout = self.layout - - layout.operator("gpencil.brush_paint", text="Sculpt Strokes").wait_for_input = True - layout.prop_menu_enum(toolsettings.gpencil_sculpt, "tool", text="Sculpt Brush") - layout.separator() - layout.menu("VIEW3D_MT_edit_gpencil_transform") - layout.operator("transform.mirror", text="Mirror") - layout.menu("GPENCIL_MT_snap") - layout.separator() - layout.menu("VIEW3D_MT_object_animation") # NOTE: provides keyingset access... - layout.separator() - layout.menu("VIEW3D_MT_edit_gpencil_delete") - layout.operator("gpencil.duplicate_move", text="Duplicate") - layout.separator() - layout.menu("VIEW3D_MT_select_gpencil") - layout.separator() - layout.operator("gpencil.copy", text="Copy") - layout.operator("gpencil.paste", text="Paste") - layout.separator() - layout.prop_menu_enum(toolsettings, "proportional_edit") - layout.prop_menu_enum(toolsettings, "proportional_edit_falloff") - layout.separator() - layout.operator("gpencil.reveal") - layout.operator("gpencil.hide", text="Show Active Layer Only").unselected = True - layout.operator("gpencil.hide", text="Hide Active Layer").unselected = False - layout.separator() - layout.operator_menu_enum("gpencil.move_to_layer", "layer", text="Move to Layer") - layout.operator_menu_enum("gpencil.convert", "type", text="Convert to Geometry...") - # ********** Text Interactive Mode ********** class VIEW3D_OT_Interactive_Mode_Text(Operator): @@ -275,31 +161,6 @@ class VIEW3D_OT_Interactive_Mode_Text(Operator): return {'FINISHED'} -# ********** Object Parent ********** -class VIEW3D_MT_ParentMenu(Menu): - bl_label = "Parent" - - def draw(self, context): - layout = self.layout - - layout.operator("object.parent_set", text="Set") - layout.operator("object.parent_clear", text="Clear") - - -# ********** Object Group ********** -class VIEW3D_MT_GroupMenu(Menu): - bl_label = "Group" - - def draw(self, context): - layout = self.layout - layout.operator("collection.create") - layout.operator("collection.objects_add_active") - layout.separator() - layout.operator("collection.objects_remove") - layout.operator("collection.objects_remove_all") - layout.operator("collection.objects_remove_active") - - # ********** Object Camera Options ********** class VIEW3D_MT_Camera_Options(Menu): bl_label = "Camera" @@ -307,22 +168,12 @@ class VIEW3D_MT_Camera_Options(Menu): def draw(self, context): layout = self.layout layout.operator_context = 'EXEC_REGION_WIN' - layout.operator("object.camera_add", text="Add Camera", icon='OUTLINER_OB_CAMERA') - layout.operator("view3d.object_as_camera", text="Object As Camera", icon='OUTLINER_OB_CAMERA') - -class VIEW3D_MT_Object_Data_Link(Menu): - bl_label = "Object Data" - - def draw(self, context): - layout = self.layout - - layout.operator_menu_enum("object.make_local", "type", text="Make Local...") - layout.menu("VIEW3D_MT_make_single_user") - layout.operator("object.proxy_make", text="Make Proxy...") - layout.operator("object.make_dupli_face") - layout.separator() - layout.operator("object.data_transfer") - layout.operator("object.datalayout_transfer") + layout.operator("object.select_camera", text="Select Camera") + layout.operator("object.camera_add", text="Add Camera") + layout.operator("view3d.view_camera", text="View Camera") + layout.operator("view3d.camera_to_view", text="Camera to View") + layout.operator("view3d.camera_to_view_selected", text="Camera to Selected") + layout.operator("view3d.object_as_camera", text="Object As Camera") class VIEW3D_MT_Duplicate(Menu): @@ -371,21 +222,51 @@ class VIEW3D_OT_SetObjectMode(Operator): return {'FINISHED'} +# currently unused +class VIEW3D_MT_Edit_Gpencil(Menu): + bl_label = "GPencil" + + def draw(self, context): + toolsettings = context.tool_settings + layout = self.layout + + layout.operator("gpencil.brush_paint", text="Sculpt Strokes").wait_for_input = True + layout.prop_menu_enum(toolsettings.gpencil_sculpt, "tool", text="Sculpt Brush") + layout.separator() + layout.menu("VIEW3D_MT_edit_gpencil_transform") + layout.operator("transform.mirror", text="Mirror") + layout.menu("GPENCIL_MT_snap") + layout.separator() + layout.menu("VIEW3D_MT_object_animation") # NOTE: provides keyingset access... + layout.separator() + layout.menu("VIEW3D_MT_edit_gpencil_delete") + layout.operator("gpencil.duplicate_move", text="Duplicate") + layout.separator() + layout.menu("VIEW3D_MT_select_gpencil") + layout.separator() + layout.operator("gpencil.copy", text="Copy") + layout.operator("gpencil.paste", text="Paste") + layout.separator() + layout.prop_menu_enum(toolsettings, "proportional_edit") + layout.prop_menu_enum(toolsettings, "proportional_edit_falloff") + layout.separator() + layout.operator("gpencil.reveal") + layout.operator("gpencil.hide", text="Show Active Layer Only").unselected = True + layout.operator("gpencil.hide", text="Hide Active Layer").unselected = False + layout.separator() + layout.operator_menu_enum("gpencil.move_to_layer", "layer", text="Move to Layer") + layout.operator_menu_enum("gpencil.convert", "type", text="Convert to Geometry...") + # List The Classes # classes = ( - VIEW3D_MT_AddMenu, VIEW3D_MT_Object, - VIEW3D_MT_MirrorMenu, - VIEW3D_MT_ParentMenu, - VIEW3D_MT_GroupMenu, VIEW3D_MT_UndoS, VIEW3D_MT_Camera_Options, VIEW3D_MT_InteractiveMode, VIEW3D_MT_InteractiveModeOther, VIEW3D_OT_SetObjectMode, - VIEW3D_MT_Object_Data_Link, VIEW3D_MT_Duplicate, VIEW3D_OT_Interactive_Mode_Text, VIEW3D_OT_Interactive_Mode_Grease_Pencil, diff --git a/space_view3d_spacebar_menu/sculpt_brush_paint.py b/space_view3d_spacebar_menu/sculpt_brush_paint.py deleted file mode 100644 index 002a7f9c..00000000 --- a/space_view3d_spacebar_menu/sculpt_brush_paint.py +++ /dev/null @@ -1,339 +0,0 @@ -# ##### BEGIN GPL LICENSE BLOCK ##### -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -# ##### END GPL LICENSE BLOCK ##### -# Contributed to by: meta-androcto, JayDez, sim88, sam, lijenstina, mkb, wisaac, CoDEmanX # - - -import bpy -from bpy.types import ( - Operator, - Menu, - ) -from bpy.props import ( - BoolProperty, - StringProperty, - ) - -from bl_ui.properties_paint_common import UnifiedPaintPanel -from .object_menus import * - -# Brushes Menu's # -# Thanks to CoDEmanX for the code -class VIEW3D_MT_Brush_Selection(Menu): - bl_label = "Brush Tool" - - def draw(self, context): - layout = self.layout - settings = UnifiedPaintPanel.paint_settings(context) - - # check if brush exists (for instance, in paint mode before adding a slot) - if hasattr(settings, 'brush'): - brush = settings.brush - else: - brush = None - - if not brush: - layout.label(text="No Brushes currently available", icon="INFO") - return - - if not context.particle_edit_object: - if UseBrushesLists(): - flow = layout.column_flow(columns=3) - - for brsh in bpy.data.brushes: - if (context.sculpt_object and brsh.use_paint_sculpt): - props = flow.operator("wm.context_set_id", text=brsh.name, - icon_value=layout.icon(brsh)) - props.data_path = "tool_settings.sculpt.brush" - props.value = brsh.name - elif (context.image_paint_object and brsh.use_paint_image): - props = flow.operator("wm.context_set_id", text=brsh.name, - icon_value=layout.icon(brsh)) - props.data_path = "tool_settings.image_paint.brush" - props.value = brsh.name - elif (context.vertex_paint_object and brsh.use_paint_vertex): - props = flow.operator("wm.context_set_id", text=brsh.name, - icon_value=layout.icon(brsh)) - props.data_path = "tool_settings.vertex_paint.brush" - props.value = brsh.name - elif (context.weight_paint_object and brsh.use_paint_weight): - props = flow.operator("wm.context_set_id", text=brsh.name, - icon_value=layout.icon(brsh)) - props.data_path = "tool_settings.weight_paint.brush" - props.value = brsh.name - else: - layout.template_ID_preview(settings, "brush", new="brush.add", rows=3, cols=8) - - -class VIEW3D_MT_Brush_Settings(Menu): - bl_label = "Brush Settings" - - def draw(self, context): - layout = self.layout - settings = UnifiedPaintPanel.paint_settings(context) - brush = getattr(settings, "brush", None) - - ups = context.tool_settings.unified_paint_settings - layout.prop(ups, "use_unified_size", text="Unified Size") - layout.prop(ups, "use_unified_strength", text="Unified Strength") - if context.image_paint_object or context.vertex_paint_object: - layout.prop(ups, "use_unified_color", text="Unified Color") - layout.separator() - - if not brush: - layout.label(text="No Brushes currently available", icon="INFO") - return - - layout.menu("VIEW3D_MT_brush_paint_modes") - - if context.sculpt_object: - sculpt_tool = brush.sculpt_tool - - layout.separator() - layout.operator_menu_enum("brush.curve_preset", "shape", text="Curve Preset") - layout.separator() - - if sculpt_tool != 'GRAB': - layout.prop_menu_enum(brush, "stroke_method") - - if sculpt_tool in {'DRAW', 'PINCH', 'INFLATE', 'LAYER', 'CLAY'}: - layout.prop_menu_enum(brush, "direction") - - if sculpt_tool == 'LAYER': - layout.prop(brush, "use_persistent") - layout.operator("sculpt.set_persistent_base") - - -# Sculpt Menu's # -class VIEW3D_MT_Sculpts(Menu): - bl_label = "Sculpt" - - def draw(self, context): - layout = self.layout - toolsettings = context.tool_settings - sculpt = toolsettings.sculpt - - layout.prop(sculpt, "use_symmetry_x") - layout.prop(sculpt, "use_symmetry_y") - layout.prop(sculpt, "use_symmetry_z") - - layout.separator() - layout.prop(sculpt, "lock_x") - layout.prop(sculpt, "lock_y") - layout.prop(sculpt, "lock_z") - - layout.separator() - layout.prop(sculpt, "use_threaded", text="Threaded Sculpt") - layout.prop(sculpt, "show_low_resolution") - layout.prop(sculpt, "use_deform_only") - - layout.separator() - layout.prop(sculpt, "show_brush") - - -class VIEW3D_MT_Hide_Masks(Menu): - bl_label = "Hide/Mask" - - def draw(self, context): - layout = self.layout - - props = layout.operator("paint.mask_lasso_gesture", text="Lasso Mask") - layout.separator() - props = layout.operator("view3d.select_box", text="Box Mask") - props = layout.operator("paint.hide_show", text="Box Hide") - props.action = 'HIDE' - props.area = 'INSIDE' - - props = layout.operator("paint.hide_show", text="Box Show") - props.action = 'SHOW' - props.area = 'INSIDE' - layout.separator() - - props = layout.operator("paint.mask_flood_fill", text="Fill Mask") - props.mode = 'VALUE' - props.value = 1 - - props = layout.operator("paint.mask_flood_fill", text="Clear Mask") - props.mode = 'VALUE' - props.value = 0 - - layout.operator("paint.mask_flood_fill", text="Invert Mask").mode = 'INVERT' - layout.separator() - - props = layout.operator("paint.hide_show", text="Show All", icon="RESTRICT_VIEW_OFF") - props.action = 'SHOW' - props.area = 'ALL' - - props = layout.operator("paint.hide_show", text="Hide Masked", icon="RESTRICT_VIEW_ON") - props.area = 'MASKED' - props.action = 'HIDE' - - -# Sculpt Specials Menu (Thanks to marvin.k.breuer) # -class VIEW3D_MT_Sculpt_Specials(Menu): - bl_label = "Sculpt Specials" - - def draw(self, context): - layout = self.layout - settings = context.tool_settings - - if context.sculpt_object.use_dynamic_topology_sculpting: - layout.operator("sculpt.dynamic_topology_toggle", - icon='X', text="Disable Dyntopo") - layout.separator() - - if (settings.sculpt.detail_type_method == 'CONSTANT'): - layout.prop(settings.sculpt, "constant_detail", text="Const.") - layout.operator("sculpt.sample_detail_size", text="", icon='EYEDROPPER') - else: - layout.prop(settings.sculpt, "detail_size", text="Detail") - layout.separator() - - layout.operator("sculpt.symmetrize", icon='ARROW_LEFTRIGHT') - layout.prop(settings.sculpt, "symmetrize_direction", "") - layout.separator() - - layout.operator("sculpt.optimize") - if (settings.sculpt.detail_type_method == 'CONSTANT'): - layout.operator("sculpt.detail_flood_fill") - layout.separator() - - layout.prop(settings.sculpt, "detail_refine_method", text="") - layout.prop(settings.sculpt, "detail_type_method", text="") - layout.separator() - layout.prop(settings.sculpt, "use_smooth_shading", "Smooth") - else: - layout.operator("sculpt.dynamic_topology_toggle", text="Enable Dyntopo") - - -# Vertex Color Menu # -class VIEW3D_MT_Vertex_Colors(Menu): - bl_label = "Vertex Colors" - - def draw(self, context): - layout = self.layout - layout.operator("paint.vertex_color_set") - layout.separator() - - layout.operator("paint.vertex_color_smooth") - layout.operator("paint.vertex_color_dirt") - - -# Weight Paint Menu # -class VIEW3D_MT_Paint_Weights(Menu): - bl_label = "Weights" - - def draw(self, context): - layout = self.layout - - layout.operator("paint.weight_from_bones", - text="Assign Automatic From Bones").type = 'AUTOMATIC' - layout.operator("paint.weight_from_bones", - text="Assign From Bone Envelopes").type = 'ENVELOPES' - layout.separator() - - layout.operator("object.vertex_group_normalize_all", text="Normalize All") - layout.operator("object.vertex_group_normalize", text="Normalize") - layout.separator() - - layout.operator("object.vertex_group_mirror", text="Mirror") - layout.operator("object.vertex_group_invert", text="Invert") - layout.separator() - - layout.operator("object.vertex_group_clean", text="Clean") - layout.operator("object.vertex_group_quantize", text="Quantize") - layout.separator() - - layout.operator("object.vertex_group_levels", text="Levels") - layout.operator("object.vertex_group_smooth", text="Smooth") - layout.separator() - - props = layout.operator("object.data_transfer", text="Transfer Weights") - props.use_reverse_transfer = True - props.data_type = 'VGROUP_WEIGHTS' - layout.separator() - - layout.operator("object.vertex_group_limit_total", text="Limit Total") - layout.operator("object.vertex_group_fix", text="Fix Deforms") - layout.separator() - - layout.operator("paint.weight_set") - - -class VIEW3D_MT_Angle_Control(Menu): - bl_label = "Angle Control" - - @classmethod - def poll(cls, context): - settings = UnifiedPaintPanel.paint_settings(context) - if not settings: - return False - - brush = settings.brush - tex_slot = brush.texture_slot - - return tex_slot.has_texture_angle and tex_slot.has_texture_angle_source - - def draw(self, context): - layout = self.layout - - settings = UnifiedPaintPanel.paint_settings(context) - brush = settings.brush - - sculpt = (context.sculpt_object is not None) - - tex_slot = brush.texture_slot - - layout.prop(tex_slot, "use_rake", text="Rake") - - if brush.brush_capabilities.has_random_texture_angle and tex_slot.has_random_texture_angle: - if sculpt: - if brush.sculpt_capabilities.has_random_texture_angle: - layout.prop(tex_slot, "use_random", text="Random") - else: - layout.prop(tex_slot, "use_random", text="Random") - - -# List The Classes # - -classes = ( - VIEW3D_MT_Angle_Control, - VIEW3D_MT_Sculpt_Specials, - VIEW3D_MT_Brush_Settings, - VIEW3D_MT_Brush_Selection, - VIEW3D_MT_Sculpts, - VIEW3D_MT_Hide_Masks, - VIEW3D_MT_Vertex_Colors, - VIEW3D_MT_Paint_Weights, -) - - -# Register Classes & Hotkeys # -def register(): - for cls in classes: - bpy.utils.register_class(cls) - - -# Unregister Classes & Hotkeys # -def unregister(): - - for cls in reversed(classes): - bpy.utils.unregister_class(cls) - - -if __name__ == "__main__": - register() diff --git a/space_view3d_spacebar_menu/select_menus.py b/space_view3d_spacebar_menu/select_menus.py deleted file mode 100644 index 3b1dbc9b..00000000 --- a/space_view3d_spacebar_menu/select_menus.py +++ /dev/null @@ -1,440 +0,0 @@ -# ##### BEGIN GPL LICENSE BLOCK ##### -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -# ##### END GPL LICENSE BLOCK ##### -# Contributed to by: meta-androcto, JayDez, sim88, sam, lijenstina, mkb, wisaac, CoDEmanX # - - -import bpy -from bpy.types import ( - Operator, - Menu, - ) -from bpy.props import ( - BoolProperty, - StringProperty, - ) - -from bl_ui.properties_paint_common import UnifiedPaintPanel -from .object_menus import * - -# Select Menu's # - -# Object Select # -class VIEW3D_MT_Select_Object(Menu): - bl_label = "Select" - - def draw(self, context): - layout = self.layout - layout.operator_context = 'INVOKE_REGION_WIN' - layout.operator("view3d.select_box") - layout.operator("view3d.select_circle") - layout.separator() - layout.operator("object.select_all", text="All").action = 'SELECT' - layout.operator("object.select_all", text="None").action = 'DESELECT' - layout.operator("object.select_all", text="Invert").action = 'INVERT' - layout.separator() - layout.operator("object.select_camera", text="Select Active Camera") - layout.operator("object.select_mirror", text="Mirror Selection") - layout.operator("object.select_random", text="Select Random") - layout.separator() - layout.operator_menu_enum("object.select_by_type", "type", text="Select All by Type...") - layout.operator_menu_enum("object.select_grouped", "type", text="Select Grouped") - layout.operator_menu_enum("object.select_linked", "type", text="Select Linked") - layout.separator() - layout.menu("VIEW3D_MT_Select_Object_More_Less", text="More/Less") - layout.operator("object.select_pattern", text="Select Pattern...") - - -class VIEW3D_MT_Select_Object_More_Less(Menu): - bl_label = "Select More/Less" - - def draw(self, context): - layout = self.layout - layout.operator("object.select_more", text="More") - layout.operator("object.select_less", text="Less") - layout.separator() - props = layout.operator("object.select_hierarchy", text="Parent") - props.extend = False - props.direction = 'PARENT' - props = layout.operator("object.select_hierarchy", text="Child") - props.extend = False - props.direction = 'CHILD' - layout.separator() - props = layout.operator("object.select_hierarchy", text="Extend Parent") - props.extend = True - props.direction = 'PARENT' - props = layout.operator("object.select_hierarchy", text="Extend Child") - props.extend = True - props.direction = 'CHILD' - - -# Edit Curve Select # -class VIEW3D_MT_Select_Edit_Curve(Menu): - bl_label = "Select" - - def draw(self, context): - layout = self.layout - layout.operator("view3d.select_box") - layout.operator("view3d.select_circle") - layout.separator() - layout.operator("curve.select_all").action = 'TOGGLE' - layout.operator("curve.select_all", text="Inverse").action = 'INVERT' - layout.operator("curve.select_nth") - layout.separator() - layout.operator("curve.select_random") - layout.operator("curve.select_linked", text="Select Linked") - layout.operator("curve.select_similar", text="Select Similar") - layout.operator("curve.de_select_first") - layout.operator("curve.de_select_last") - layout.operator("curve.select_next") - layout.operator("curve.select_previous") - layout.separator() - layout.operator("curve.select_more") - layout.operator("curve.select_less") - - -# Armature Select # -class VIEW3D_MT_SelectArmatureMenu(Menu): - bl_label = "Select" - - def draw(self, context): - layout = self.layout - layout.operator("view3d.select_box") - layout.operator("armature.select_all") - layout.operator("armature.select_inverse", text="Inverse") - layout.operator("armature.select_hierarchy", - text="Parent").direction = 'PARENT' - layout.operator("armature.select_hierarchy", - text="Child").direction = 'CHILD' - props = layout.operator("armature.select_hierarchy", - text="Extend Parent") - props.extend = True - props.direction = 'PARENT' - props = layout.operator("armature.select_hierarchy", - text="Extend Child") - props.extend = True - props.direction = 'CHILD' - layout.operator("object.select_pattern", text="Select Pattern...") - - -class VIEW3D_MT_Select_Edit_Armature(Menu): - bl_label = "Select" - - def draw(self, context): - layout = self.layout - - layout.operator("view3d.select_box") - layout.operator("view3d.select_circle") - - layout.separator() - - layout.operator("armature.select_all").action = 'TOGGLE' - layout.operator("armature.select_all", text="Inverse").action = 'INVERT' - layout.operator("armature.select_mirror", text="Mirror").extend = False - - layout.separator() - - layout.operator("armature.select_more", text="More") - layout.operator("armature.select_less", text="Less") - - layout.separator() - - props = layout.operator("armature.select_hierarchy", text="Parent") - props.extend = False - props.direction = 'PARENT' - - props = layout.operator("armature.select_hierarchy", text="Child") - props.extend = False - props.direction = 'CHILD' - - layout.separator() - - props = layout.operator("armature.select_hierarchy", text="Extend Parent") - props.extend = True - props.direction = 'PARENT' - - props = layout.operator("armature.select_hierarchy", text="Extend Child") - props.extend = True - props.direction = 'CHILD' - - layout.operator_menu_enum("armature.select_similar", "type", text="Similar") - layout.operator("object.select_pattern", text="Select Pattern...") - - -class VIEW3D_MT_Select_Pose(Menu): - bl_label = "Select" - - def draw(self, context): - layout = self.layout - layout.operator("view3d.select_box") - layout.operator("view3d.select_circle") - layout.separator() - layout.operator("pose.select_all").action = 'TOGGLE' - layout.operator("pose.select_all", text="Inverse").action = 'INVERT' - layout.operator("pose.select_mirror", text="Flip Active") - layout.operator("pose.select_constraint_target", - text="Constraint Target") - layout.separator() - layout.operator("pose.select_linked", text="Linked") - layout.operator("pose.select_hierarchy", - text="Parent").direction = 'PARENT' - layout.operator("pose.select_hierarchy", - text="Child").direction = 'CHILD' - props = layout.operator("pose.select_hierarchy", text="Extend Parent") - props.extend = True - props.direction = 'PARENT' - props = layout.operator("pose.select_hierarchy", text="Extend Child") - props.extend = True - props.direction = 'CHILD' - layout.operator_menu_enum("pose.select_grouped", "type", - text="Grouped") - layout.separator() - layout.operator("object.select_pattern", text="Select Pattern...") - layout.menu("VIEW3D_MT_select_pose_more_less") - - -class VIEW3D_MT_Select_Pose_More_Less(Menu): - bl_label = "Select More/Less" - - def draw(self, context): - layout = self.layout - props = layout.operator("pose.select_hierarchy", text="Parent") - props.extend = False - props.direction = 'PARENT' - - props = layout.operator("pose.select_hierarchy", text="Child") - props.extend = False - props.direction = 'CHILD' - - props = layout.operator("pose.select_hierarchy", text="Extend Parent") - props.extend = True - props.direction = 'PARENT' - - props = layout.operator("pose.select_hierarchy", text="Extend Child") - props.extend = True - props.direction = 'CHILD' - - - -# Surface Select # -class VIEW3D_MT_Select_Edit_Surface(Menu): - bl_label = "Select" - - def draw(self, context): - layout = self.layout - layout.operator("view3d.select_box") - layout.operator("view3d.select_circle") - layout.separator() - layout.operator("curve.select_all").action = 'TOGGLE' - layout.operator("curve.select_all", text="Inverse").action = 'INVERT' - layout.operator("curve.select_random") - layout.operator("curve.select_nth") - layout.operator("curve.select_linked", text="Select Linked") - layout.operator("curve.select_similar", text="Select Similar") - layout.operator("curve.select_row") - layout.separator() - layout.operator("curve.select_more") - layout.operator("curve.select_less") - - -# Metaball Select # -class VIEW3D_MT_SelectMetaball(Menu): - bl_label = "Select" - - def draw(self, context): - layout = self.layout - layout.operator("view3d.select_box") - layout.operator("view3d.select_circle") - layout.separator() - layout.operator("mball.select_all").action = 'TOGGLE' - layout.operator("mball.select_all").action = 'INVERT' - layout.operator("mball.select_random_metaelems") - - -class VIEW3D_MT_Select_Edit_Metaball(Menu): - bl_label = "Select" - - def draw(self, context): - layout = self.layout - layout.operator("view3d.select_box") - layout.operator("view3d.select_circle") - layout.operator("mball.select_all").action = 'TOGGLE' - layout.operator("mball.select_all", text="Inverse").action = 'INVERT' - layout.operator("mball.select_random_metaelems") - layout.operator_menu_enum("mball.select_similar", "type", text="Similar") - - -# Particle Select # -class VIEW3D_MT_Selection_Mode_Particle(Menu): - bl_label = "Particle Select and Display Mode" - - def draw(self, context): - layout = self.layout - toolsettings = context.tool_settings - - layout.prop(toolsettings.particle_edit, "select_mode", expand=True) - - -class VIEW3D_MT_Select_Particle(Menu): - bl_label = "Select" - - def draw(self, context): - layout = self.layout - - layout.operator("view3d.select_box") - layout.operator("view3d.select_circle") - layout.separator() - - layout.operator("particle.select_all").action = 'TOGGLE' - layout.operator("particle.select_linked") - layout.operator("particle.select_all", text="Inverse").action = 'INVERT' - - layout.separator() - layout.operator("particle.select_more") - layout.operator("particle.select_less") - - layout.separator() - layout.operator("particle.select_random") - - layout.separator() - layout.operator("particle.select_roots", text="Roots") - layout.operator("particle.select_tips", text="Tips") - - -# Lattice Edit Select # -class VIEW3D_MT_Select_Edit_Lattice(Menu): - bl_label = "Select" - - def draw(self, context): - layout = self.layout - - layout.operator("view3d.select_box") - layout.operator("view3d.select_circle") - layout.separator() - layout.operator("lattice.select_mirror") - layout.operator("lattice.select_random") - layout.operator("lattice.select_all").action = 'TOGGLE' - layout.operator("lattice.select_all", text="Inverse").action = 'INVERT' - layout.separator() - layout.operator("lattice.select_ungrouped", text="Ungrouped Verts") - - -# Grease Pencil Select # -class VIEW3D_MT_Select_Gpencil(Menu): - # To Do: used in 3dview header might work if mapped to mouse - # Not in Class List yet - bl_label = "Select" - - def draw(self, context): - layout = self.layout - - layout.operator("gpencil.select_box") - layout.operator("gpencil.select_circle") - - layout.separator() - - layout.operator("gpencil.select_all", text="(De)select All").action = 'TOGGLE' - layout.operator("gpencil.select_all", text="Inverse").action = 'INVERT' - layout.operator("gpencil.select_linked", text="Linked") - # layout.operator_menu_enum("gpencil.select_grouped", "type", text="Grouped") - layout.operator("gpencil.select_grouped", text="Grouped") - - layout.separator() - - layout.operator("gpencil.select_more") - layout.operator("gpencil.select_less") - - -# Text Select # -class VIEW3D_MT_Select_Edit_Text(Menu): - # To Do: used in 3dview header might work if mapped to mouse - # Not in Class List yet - bl_label = "Edit" - - def draw(self, context): - layout = self.layout - layout.operator("font.text_copy", text="Copy") - layout.operator("font.text_cut", text="Cut") - layout.operator("font.text_paste", text="Paste") - layout.operator("font.text_paste_from_file") - layout.operator("font.select_all") - - -# Paint Mode Menus # -class VIEW3D_MT_Select_Paint_Mask(Menu): - bl_label = "Select" - - def draw(self, context): - layout = self.layout - layout.operator("view3d.select_box") - layout.operator("view3d.select_circle") - layout.operator("paint.face_select_all").action = 'TOGGLE' - layout.operator("paint.face_select_all", text="Inverse").action = 'INVERT' - layout.operator("paint.face_select_linked", text="Linked") - - -class VIEW3D_MT_Select_Paint_Mask_Vertex(Menu): - bl_label = "Select" - - def draw(self, context): - layout = self.layout - layout.operator("view3d.select_box") - layout.operator("view3d.select_circle") - layout.operator("paint.vert_select_all").action = 'TOGGLE' - layout.operator("paint.vert_select_all", text="Inverse").action = 'INVERT' - layout.operator("paint.vert_select_ungrouped", text="Ungrouped Verts") - - - -# List The Classes # - -classes = ( - VIEW3D_MT_Select_Object, - VIEW3D_MT_Select_Object_More_Less, - VIEW3D_MT_Select_Edit_Curve, - VIEW3D_MT_SelectArmatureMenu, - VIEW3D_MT_Select_Edit_Armature, - VIEW3D_MT_Select_Pose, - VIEW3D_MT_Select_Pose_More_Less, - VIEW3D_MT_Select_Edit_Surface, - VIEW3D_MT_SelectMetaball, - VIEW3D_MT_Select_Edit_Metaball, - VIEW3D_MT_Select_Particle, - VIEW3D_MT_Select_Edit_Lattice, - VIEW3D_MT_Select_Paint_Mask, - VIEW3D_MT_Select_Paint_Mask_Vertex, - VIEW3D_MT_Selection_Mode_Particle, - VIEW3D_MT_Select_Gpencil, - VIEW3D_MT_Select_Edit_Text, -) - - -# Register Classes & Hotkeys # -def register(): - for cls in classes: - bpy.utils.register_class(cls) - - -# Unregister Classes & Hotkeys # -def unregister(): - - for cls in reversed(classes): - bpy.utils.unregister_class(cls) - - -if __name__ == "__main__": - register() diff --git a/space_view3d_spacebar_menu/snap_origin_cursor.py b/space_view3d_spacebar_menu/snap_origin_cursor.py index 886f5546..b35bd976 100644 --- a/space_view3d_spacebar_menu/snap_origin_cursor.py +++ b/space_view3d_spacebar_menu/snap_origin_cursor.py @@ -20,114 +20,114 @@ import bpy from bpy.types import ( - Operator, - Menu, - ) + Operator, + Menu, + ) from bpy.props import ( - BoolProperty, - StringProperty, - ) + BoolProperty, + StringProperty, + ) from .object_menus import * # ********** Object Snap Cursor ********** class VIEW3D_MT_Snap_Context(Menu): - bl_label = "Snapping" + bl_label = "Snapping" - def draw(self, context): - layout = self.layout - toolsettings = context.tool_settings - layout.prop(toolsettings, "use_snap") - layout.prop(toolsettings, "snap_elements", expand=True) + def draw(self, context): + layout = self.layout + toolsettings = context.tool_settings + layout.prop(toolsettings, "use_snap") + layout.prop(toolsettings, "snap_elements", expand=True) class VIEW3D_MT_Snap_Origin(Menu): - bl_label = "Snap Origin" - - def draw(self, context): - layout = self.layout - layout.operator_context = 'EXEC_AREA' - layout.operator("object.origin_set", - text="Geometry to Origin").type = 'GEOMETRY_ORIGIN' - layout.separator() - layout.operator("object.origin_set", - text="Origin to Geometry").type = 'ORIGIN_GEOMETRY' - layout.operator("object.origin_set", - text="Origin to 3D Cursor").type = 'ORIGIN_CURSOR' - layout.operator("object.origin_set", - text="Origin to Center of Mass").type = 'ORIGIN_CENTER_OF_MASS' + bl_label = "Snap Origin" + + def draw(self, context): + layout = self.layout + layout.operator_context = 'EXEC_AREA' + layout.operator("object.origin_set", + text="Geometry to Origin").type = 'GEOMETRY_ORIGIN' + layout.separator() + layout.operator("object.origin_set", + text="Origin to Geometry").type = 'ORIGIN_GEOMETRY' + layout.operator("object.origin_set", + text="Origin to 3D Cursor").type = 'ORIGIN_CURSOR' + layout.operator("object.origin_set", + text="Origin to Center of Mass").type = 'ORIGIN_CENTER_OF_MASS' class VIEW3D_MT_CursorMenu(Menu): - bl_label = "Snap" - - def draw(self, context): - layout = self.layout - layout.operator_context = 'INVOKE_REGION_WIN' - layout.menu("VIEW3D_MT_Snap_Origin") - layout.menu("VIEW3D_MT_Snap_Context") - layout.separator() - layout.operator("view3d.snap_cursor_to_selected", - text="Cursor to Selected") - layout.operator("view3d.snap_cursor_to_center", - text="Cursor to World Origin") - layout.operator("view3d.snap_cursor_to_grid", - text="Cursor to Grid") - layout.operator("view3d.snap_cursor_to_active", - text="Cursor to Active") - layout.separator() - layout.operator("view3d.snap_selected_to_cursor", - text="Selection to Cursor").use_offset = False - layout.operator("view3d.snap_selected_to_cursor", - text="Selection to Cursor (Keep Offset)").use_offset = True - layout.operator("view3d.snap_selected_to_grid", - text="Selection to Grid") - layout.operator("view3d.snap_cursor_selected_to_center", - text="Selection and Cursor to World Origin") + bl_label = "Snap To" + + def draw(self, context): + layout = self.layout + layout.operator_context = 'INVOKE_REGION_WIN' + layout.menu("VIEW3D_MT_Snap_Origin") + layout.menu("VIEW3D_MT_Snap_Context") + layout.separator() + layout.operator("view3d.snap_cursor_to_selected", + text="Cursor to Selected") + layout.operator("view3d.snap_cursor_to_center", + text="Cursor to World Origin") + layout.operator("view3d.snap_cursor_to_grid", + text="Cursor to Grid") + layout.operator("view3d.snap_cursor_to_active", + text="Cursor to Active") + layout.separator() + layout.operator("view3d.snap_selected_to_cursor", + text="Selection to Cursor").use_offset = False + layout.operator("view3d.snap_selected_to_cursor", + text="Selection to Cursor (Keep Offset)").use_offset = True + layout.operator("view3d.snap_selected_to_grid", + text="Selection to Grid") + layout.operator("view3d.snap_cursor_selected_to_center", + text="Selection and Cursor to World Origin") class VIEW3D_MT_CursorMenuLite(Menu): - bl_label = "Snap Cursor" - - def draw(self, context): - layout = self.layout - layout.operator_context = 'INVOKE_REGION_WIN' - layout.menu("VIEW3D_MT_Snap_Origin") - layout.separator() - layout.operator("view3d.snap_cursor_to_selected", - text="Cursor to Selected") - layout.operator("view3d.snap_cursor_to_center", - text="Cursor to World Origin") - layout.operator("view3d.snap_cursor_to_grid", - text="Cursor to Grid") - layout.operator("view3d.snap_cursor_to_active", - text="Cursor to Active") - layout.separator() - layout.operator("view3d.snap_selected_to_cursor", - text="Selection to Cursor").use_offset = False - layout.operator("view3d.snap_selected_to_cursor", - text="Selection to Cursor (Keep Offset)").use_offset = True - layout.operator("view3d.snap_selected_to_grid", - text="Selection to Grid") - layout.operator("view3d.snap_cursor_selected_to_center", - text="Selection and Cursor to World Origin") + bl_label = "Snap to" + + def draw(self, context): + layout = self.layout + layout.operator_context = 'INVOKE_REGION_WIN' + layout.menu("VIEW3D_MT_Snap_Origin") + layout.separator() + layout.operator("view3d.snap_cursor_to_selected", + text="Cursor to Selected") + layout.operator("view3d.snap_cursor_to_center", + text="Cursor to World Origin") + layout.operator("view3d.snap_cursor_to_grid", + text="Cursor to Grid") + layout.operator("view3d.snap_cursor_to_active", + text="Cursor to Active") + layout.separator() + layout.operator("view3d.snap_selected_to_cursor", + text="Selection to Cursor").use_offset = False + layout.operator("view3d.snap_selected_to_cursor", + text="Selection to Cursor (Keep Offset)").use_offset = True + layout.operator("view3d.snap_selected_to_grid", + text="Selection to Grid") + layout.operator("view3d.snap_cursor_selected_to_center", + text="Selection and Cursor to World Origin") # Code thanks to Isaac Weaver (wisaac) D1963 class VIEW3D_OT_SnapCursSelToCenter(Operator): - bl_idname = "view3d.snap_cursor_selected_to_center" - bl_label = "Snap Cursor & Selection to World Origin" - bl_description = ("Snap 3D cursor and selected objects to the center \n" - "Works only in Object Mode") + bl_idname = "view3d.snap_cursor_selected_to_center" + bl_label = "Snap Cursor & Selection to World Origin" + bl_description = ("Snap 3D cursor and selected objects to the center \n" + "Works only in Object Mode") - @classmethod - def poll(cls, context): - return (context.area.type == "VIEW_3D" and context.mode == "OBJECT") + @classmethod + def poll(cls, context): + return (context.area.type == "VIEW_3D" and context.mode == "OBJECT") - def execute(self, context): - context.scene.cursor.location = (0, 0, 0) - for obj in context.selected_objects: - obj.location = (0, 0, 0) - return {'FINISHED'} + def execute(self, context): + context.scene.cursor.location = (0, 0, 0) + for obj in context.selected_objects: + obj.location = (0, 0, 0) + return {'FINISHED'} # Cursor Edge Intersection Defs # @@ -239,32 +239,64 @@ class VIEW3D_OT_SetOriginToSelected(Operator): return {'FINISHED'} +# ********** Edit Mesh Cursor ********** +class VIEW3D_MT_EditCursorMenu(Menu): + bl_label = "Snap To" + + def draw(self, context): + layout = self.layout + layout.operator_context = 'INVOKE_REGION_WIN' + layout.operator("object.setorigintoselected", + text="Origin to Selected V/F/E") + layout.separator() + layout.menu("VIEW3D_MT_Snap_Origin") + layout.menu("VIEW3D_MT_Snap_Context") + layout.separator() + layout.operator("view3d.snap_cursor_to_selected", + text="Cursor to Selected") + layout.operator("view3d.snap_cursor_to_center", + text="Cursor to World Origin") + layout.operator("view3d.snap_cursor_to_grid", + text="Cursor to Grid") + layout.operator("view3d.snap_cursor_to_active", + text="Cursor to Active") + layout.operator("view3d.snap_cursor_to_edge_intersection", + text="Cursor to Edge Intersection") + layout.separator() + layout.operator("view3d.snap_selected_to_cursor", + text="Selection to Cursor").use_offset = False + layout.operator("view3d.snap_selected_to_cursor", + text="Selection to Cursor (Keep Offset)").use_offset = True + layout.operator("view3d.snap_selected_to_grid", + text="Selection to Grid") + # List The Classes # classes = ( - VIEW3D_MT_CursorMenu, - VIEW3D_MT_CursorMenuLite, - VIEW3D_MT_Snap_Context, - VIEW3D_MT_Snap_Origin, - VIEW3D_OT_SnapCursSelToCenter, - VIEW3D_OT_CursorToEdgeIntersection, - VIEW3D_OT_SetOriginToSelected, + VIEW3D_MT_CursorMenu, + VIEW3D_MT_CursorMenuLite, + VIEW3D_MT_Snap_Context, + VIEW3D_MT_Snap_Origin, + VIEW3D_OT_SnapCursSelToCenter, + VIEW3D_OT_CursorToEdgeIntersection, + VIEW3D_OT_SetOriginToSelected, + VIEW3D_MT_EditCursorMenu, ) # Register Classes & Hotkeys # def register(): - for cls in classes: - bpy.utils.register_class(cls) + for cls in classes: + bpy.utils.register_class(cls) # Unregister Classes & Hotkeys # def unregister(): - for cls in reversed(classes): - bpy.utils.unregister_class(cls) + for cls in reversed(classes): + bpy.utils.unregister_class(cls) if __name__ == "__main__": - register() + register() diff --git a/space_view3d_spacebar_menu/transform_menus.py b/space_view3d_spacebar_menu/transform_menus.py index 914bdf4c..a6438bd9 100644 --- a/space_view3d_spacebar_menu/transform_menus.py +++ b/space_view3d_spacebar_menu/transform_menus.py @@ -74,7 +74,11 @@ class VIEW3D_MT_TransformMenuLite(Menu): layout.separator() layout.operator("transform.transform", text="Align to Transform Orientation").mode = 'ALIGN' - + layout.separator() + layout.operator("object.align") + layout.operator_context = 'EXEC_REGION_WIN' + layout.operator("transform.transform", + text="Align to Transform Orientation").mode = 'ALIGN' # ********** Transform Camera ********** class VIEW3D_MT_TransformMenuCamera(Menu): @@ -118,61 +122,11 @@ class VIEW3D_MT_TransformMenuArmature(Menu): text="Origin to Center of Mass").type = 'ORIGIN_CENTER_OF_MASS' -# ********** Transform Armature Edit ********** -class VIEW3D_MT_TransformMenuArmatureEdit(Menu): - bl_label = "Transform" - - def draw(self, context): - layout = self.layout - layout.operator("transform.translate", text="Move") - layout.operator("transform.rotate", text="Rotate") - layout.operator("transform.resize", text="Scale") - layout.separator() - layout.operator("transform.tosphere", text="To Sphere") - layout.operator("transform.shear", text="Shear") - layout.operator("transform.bend", text="Bend") - layout.operator("transform.push_pull", text="Push/Pull") - layout.operator("transform.vertex_warp", text="Warp") - layout.separator() - layout.operator("transform.vertex_random", text="Randomize") - layout.operator("armature.align") - layout.operator_context = 'EXEC_AREA' - - -# ********** Transform Armature Pose ********** -class VIEW3D_MT_TransformMenuArmaturePose(Menu): - bl_label = "Transform" - - def draw(self, context): - layout = self.layout - layout.operator("transform.translate", text="Move") - layout.operator("transform.rotate", text="Rotate") - layout.operator("transform.resize", text="Scale") - layout.separator() - layout.operator("pose.transforms_clear", text="Clear All") - layout.operator("pose.loc_clear", text="Location") - layout.operator("pose.rot_clear", text="Rotation") - layout.operator("pose.scale_clear", text="Scale") - - layout.separator() - - layout.operator("pose.user_transforms_clear", text="Reset unkeyed") - obj = context.object - if obj.type == 'ARMATURE' and obj.mode in {'EDIT', 'POSE'}: - if obj.data.display_type == 'BBONE': - layout.operator("transform.transform", text="Scale BBone").mode = 'BONE_SIZE' - elif obj.data.display_type == 'ENVELOPE': - layout.operator("transform.transform", text="Scale Envelope Distance").mode = 'BONE_SIZE' - layout.operator("transform.transform", text="Scale Radius").mode = 'BONE_ENVELOPE' - - # List The Classes # classes = ( VIEW3D_MT_TransformMenu, VIEW3D_MT_TransformMenuArmature, - VIEW3D_MT_TransformMenuArmatureEdit, - VIEW3D_MT_TransformMenuArmaturePose, VIEW3D_MT_TransformMenuLite, VIEW3D_MT_TransformMenuCamera, ) diff --git a/space_view3d_spacebar_menu/view_menus.py b/space_view3d_spacebar_menu/view_menus.py index 107d6da3..fa959f04 100644 --- a/space_view3d_spacebar_menu/view_menus.py +++ b/space_view3d_spacebar_menu/view_menus.py @@ -28,8 +28,46 @@ from bpy.props import ( StringProperty, ) +from . edit_mesh import * # View Menu's # +class VIEW3D_MT_View_Menu(Menu): + bl_label = "View" + + def draw(self, context): + layout = self.layout + view = context.space_data + + layout.menu("VIEW3D_MT_view_viewpoint") + layout.menu("VIEW3D_MT_view_align") + layout.menu("VIEW3D_MT_view_navigation") + layout.menu("INFO_MT_area") + layout.operator_context = 'INVOKE_REGION_WIN' + layout.menu("VIEW3D_MT_view_regions", text="View Regions") + layout.menu("VIEW3D_MT_Shade") + layout.separator() + + layout.operator("view3d.view_selected", text="Frame Selected").use_all_regions = False + if view.region_quadviews: + layout.operator("view3d.view_selected", text="Frame Selected (Quad View)").use_all_regions = True + layout.operator("view3d.view_all", text="Frame All").center = False + layout.separator() + + layout.operator("view3d.view_persportho", text="Perspective/Orthographic") + layout.menu("VIEW3D_MT_view_local") + layout.separator() + + layout.operator("render.opengl", text="Viewport Render Image", icon='RENDER_STILL') + layout.operator("render.opengl", text="Viewport Render Animation", icon='RENDER_ANIMATION').animation = True + layout.separator() + + layout.prop(view, "show_region_toolbar") + layout.prop(view, "show_region_ui") + layout.prop(view, "show_region_tool_header") + layout.prop(view, "show_region_hud") + + + # Display Wire (Thanks to marvin.k.breuer) # class VIEW3D_OT_Display_Wire_All(Operator): bl_label = "Wire on All Objects" @@ -81,9 +119,6 @@ class VIEW3D_MT_Shade(Menu): layout.separator() layout.operator("view3d.display_wire_all", text="Wire all", icon='SHADING_WIRE') - layout.separator() - layout.prop(context.space_data.fx_settings, "use_ssao", - text="Ambient Occlusion", icon="GROUP") # layout.prop(context.space_data, "use_matcap", icon="MATCAP_01") # if context.space_data.use_matcap: @@ -100,6 +135,7 @@ def menu_func(self, context): classes = ( VIEW3D_MT_Shade, VIEW3D_OT_Display_Wire_All, + VIEW3D_MT_View_Menu ) @@ -108,14 +144,12 @@ def register(): for cls in classes: bpy.utils.register_class(cls) - bpy.types.VIEW3D_MT_view.append(menu_func) # Unregister Classes & Hotkeys # def unregister(): for cls in reversed(classes): bpy.utils.unregister_class(cls) - bpy.types.VIEW3D_MT_view.remove(menu_func) if __name__ == "__main__": register() -- cgit v1.2.3