griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.3-release'

Browse Source
This commit is contained in:
Sean Kim
2024-10-15 16:19:40 -07:00
parent 9e5206e42a f5e660f5f0
commit 3b87673eb8
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -995,19 +995,21 @@ class VIEW3D_HT_header(Header):
row.popover(panel="VIEW3D_PT_slots_color_attributes", icon='GROUP_VCOL')
elif object_mode == 'VERTEX_GREASE_PENCIL':
draw_topbar_grease_pencil_layer_panel(context, layout)
elif object_mode in {'WEIGHT_PAINT', 'WEIGHT_GREASE_PENCIL'}:
elif object_mode == 'WEIGHT_PAINT':
row = layout.row()
row.popover(panel="VIEW3D_PT_slots_vertex_groups", icon='GROUP_VERTEX')
layout.popover(
panel="VIEW3D_PT_sculpt_snapping",
icon="SNAP_INCREMENT",
text="",
translate=False,
)
elif object_mode == 'WEIGHT_GREASE_PENCIL':
row = layout.row()
row.popover(panel="VIEW3D_PT_slots_vertex_groups", icon='GROUP_VERTEX')
draw_topbar_grease_pencil_layer_panel(context, row)
if object_mode != 'WEIGHT_GREASE_PENCIL':
layout.popover(
panel="VIEW3D_PT_sculpt_snapping",
icon="SNAP_INCREMENT",
text="",
translate=False,
)
elif object_mode == 'TEXTURE_PAINT':
tool_mode = tool_settings.image_paint.mode
icon = 'MATERIAL' if tool_mode == 'MATERIAL' else 'IMAGE_DATA'