Merge branch 'blender-v4.1-release'

This commit is contained in:
Hans Goudey
2024-03-12 17:34:52 -04:00
2 changed files with 8 additions and 6 deletions
+5 -1
View File
@@ -972,7 +972,11 @@ class VIEW3D_HT_header(Header):
row = layout.row()
row.popover(panel="VIEW3D_PT_slots_projectpaint", icon=icon)
row.popover(panel="VIEW3D_PT_mask", icon=VIEW3D_HT_header._texture_mask_icon(tool_settings.image_paint), text="")
row.popover(
panel="VIEW3D_PT_mask",
icon=VIEW3D_HT_header._texture_mask_icon(
tool_settings.image_paint),
text="")
else:
# Transform settings depending on tool header visibility
VIEW3D_HT_header.draw_xform_template(layout, context)