blender
/
blender
136
411
Fork 593
Code Issues 6.3k Pull Requests 767 Projects 19 Wiki Activity

UI: Add canvas picker to paint modes in 3D Viewport #111756

Merged
Pablo Vazquez merged 7 commits from pablovazquez/blender:ui-viewport-canvas-selector into main 2023-09-06 16:21:19 +02:00
Conversation 6 Commits 7 Files Changed 2 +6 -3
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ccb2a63fad - Show all commits

9
scripts/startup/bl_ui/space_view3d.py
View File

@ -885,9 +885,12 @@ class VIEW3D_HT_header(Header):
)
elif object_mode == 'SCULPT':
canvas_source = tool_settings.paint_mode.canvas_source
icon = 'GROUP_VCOL' if canvas_source == 'COLOR_ATTRIBUTE' else canvas_source
row = layout.row()
row.ui_units_x = 6
row.popover(panel="VIEW3D_PT_slots_paint_canvas", icon="GROUP_VCOL")
row.ui_units_x = 7
row.popover(panel="VIEW3D_PT_slots_paint_canvas", icon=icon)
layout.popover(
panel="VIEW3D_PT_sculpt_automasking",
@ -906,7 +909,7 @@ class VIEW3D_HT_header(Header):
row.popover(panel="VIEW3D_PT_slots_vertex_groups", icon="GROUP_VERTEX")
elif object_mode == 'TEXTURE_PAINT':
tool_mode = context.tool_settings.image_paint.mode
tool_mode = tool_settings.image_paint.mode
icon = 'MATERIAL' if tool_mode == 'MATERIAL' else 'IMAGE_DATA'
row = layout.row()