[Bf-extensions-cvs] [8d11c9e8] master: space_view3d_spacebar_menu: large commit, rewrite: T68591
meta-androcto
noreply at git.blender.org
Mon Sep 2 00:50:31 CEST 2019
Commit: 8d11c9e82893e231b2abc093d815deb79866e03b
Author: meta-androcto
Date: Mon Sep 2 08:50:08 2019 +1000
Branches: master
https://developer.blender.org/rBA8d11c9e82893e231b2abc093d815deb79866e03b
space_view3d_spacebar_menu: large commit, rewrite: T68591
===================================================================
M space_view3d_spacebar_menu/__init__.py
M space_view3d_spacebar_menu/animation_menus.py
M space_view3d_spacebar_menu/curve_menus.py
M space_view3d_spacebar_menu/edit_mesh.py
M space_view3d_spacebar_menu/object_menus.py
D space_view3d_spacebar_menu/sculpt_brush_paint.py
D space_view3d_spacebar_menu/select_menus.py
M space_view3d_spacebar_menu/snap_origin_cursor.py
M space_view3d_spacebar_menu/transform_menus.py
M space_view3d_spacebar_menu/view_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_A
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list