blender
/
blender-addons
17
33
Fork 92
Code Issues 527 Pull Requests 32 Projects 1 Releases Wiki Activity

Dynamic Brush Menus: remove duplicate default actions: T68350

This commit is contained in:
Ryan Inch 2019-09-04 00:19:16 -04:00
parent 0abe5a6a37
commit a40886c44f
1 changed files with 11 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
space_view3d_brush_menus/brush_menu.py
View File

@ -25,7 +25,16 @@ class BrushOptionsMenu(Menu):
def draw(self, context):
mode = utils_core.get_mode()
layout = self.layout
# add generic menu items
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("SCREEN_MT_user_menu", text="Quick Favorites", icon='HEART')
layout.separator()
# add mode specific menu items
if mode == 'SCULPT':
self.sculpt(mode, layout, context)
@ -42,11 +51,7 @@ class BrushOptionsMenu(Menu):
has_brush = utils_core.get_brush_link(context, types="brush")
icons = brushes.brush_icon[mode][has_brush.sculpt_tool] if \
has_brush else "BRUSH_DATA"
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("SCREEN_MT_user_menu", text="Quick Favorites", icon='HEART')
layout.separator()
layout.row().menu("VIEW3D_MT_sv3_brushes_menu",
icon=icons)
@ -68,12 +73,6 @@ class BrushOptionsMenu(Menu):
has_brush = utils_core.get_brush_link(context, types="brush")
icons = brushes.brush_icon[mode][has_brush.vertex_tool] if \
has_brush else "BRUSH_DATA"
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("SCREEN_MT_user_menu", text="Quick Favorites", icon='HEART')
layout.separator()
if mode == 'VERTEX_PAINT':
layout.row().operator(ColorPickerPopup.bl_idname, icon="COLOR")
@ -126,10 +125,6 @@ class BrushOptionsMenu(Menu):
layout.row().label(text="Missing Data", icon='ERROR')
layout.row().label(text="See Mask Properties", icon='FORWARD')
layout.row().separator()
layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
layout.operator("wm.toolbar", text="Tools", icon='TOOL_SETTINGS')
layout.menu("SCREEN_MT_user_menu", text="Quick Favorites", icon='HEART')
layout.row().separator()
layout.row().menu("VIEW3D_MT_sv3_brushes_menu",
icon=icons)
@ -139,12 +134,6 @@ class BrushOptionsMenu(Menu):
layout.row().label(text="Missing Data", icon="INFO")
else:
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("SCREEN_MT_user_menu", text="Quick Favorites", icon='HEART')
layout.separator()
if has_brush and has_brush.image_tool in {'DRAW', 'FILL'} and \
has_brush.blend not in {'ERASE_ALPHA', 'ADD_ALPHA'}:
layout.row().operator(ColorPickerPopup.bl_idname, icon="COLOR")
@ -174,12 +163,6 @@ class BrushOptionsMenu(Menu):
def particle(self, layout, context):
particle_edit = context.tool_settings.particle_edit
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("SCREEN_MT_user_menu", text="Quick Favorites", icon='HEART')
layout.separator()
layout.row().menu("VIEW3D_MT_sv3_brushes_menu",
icon="BRUSH_DATA")