blender
/
blender
136
412
Fork 596
Code Issues 6.3k Pull Requests 775 Projects 19 Wiki Activity

WIP: Sculpt: Add operators to Mask, Face Sets, and Paint menus #105410

Draft
Tarek-Yasser wants to merge 23 commits from Tarek-Yasser/blender:102427_continued into main
pull from: Tarek-Yasser/blender:102427_continued
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 2 Commits 23 Files Changed 8 +29 -28
2 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4bef597a72 - Show all commits

55
release/scripts/startup/bl_ui/space_view3d.py
View File

@ -3269,11 +3269,9 @@ class VIEW3D_MT_sculpt(Menu):
layout.separator()
# Fair Positions
props = layout.operator("sculpt.face_set_edit", text="Fair Positions")
props.mode = 'FAIR_POSITIONS'
# Fair Tangency
props = layout.operator("sculpt.face_set_edit", text="Fair Tangency")
props.mode = 'FAIR_TANGENCY'
@ -3301,7 +3299,6 @@ class VIEW3D_MT_sculpt(Menu):
layout.separator()
# Rebuild BVH
layout.operator("sculpt.optimize")
layout.separator()
@ -3327,6 +3324,14 @@ class VIEW3D_MT_mask(Menu):
def draw(self, _context):
layout = self.layout
props = layout.operator("paint.mask_box_gesture", text="Box Mask")
props.mode = 'VALUE'
props.value = 0
props = layout.operator("paint.mask_lasso_gesture", text="Lasso Mask")
layout.separator()
props = layout.operator("paint.mask_flood_fill", text="Invert Mask")
props.mode = 'INVERT'
@ -3338,11 +3343,24 @@ class VIEW3D_MT_mask(Menu):
props.mode = 'VALUE'
props.value = 0
props = layout.operator("paint.mask_box_gesture", text="Box Mask")
props.mode = 'VALUE'
props.value = 0
props = layout.operator("sculpt.mask_by_color", text="Mask by Color")
props = layout.operator("paint.mask_lasso_gesture", text="Lasso Mask")
layout.separator()
props = layout.operator("sculpt.expand", text="Expand Mask by Topology")
props.target = 'MASK'
props.falloff_type = 'GEODESIC'
props.invert = True
props = layout.operator("sculpt.expand", text="Expand Mask by Normals")
props.target = 'MASK'
props.falloff_type = 'NORMALS'
props.invert = False
layout.separator()
props = layout.operator("sculpt.mask_from_cavity", text="Mask From Cavity")
props.settings_source = "OPERATOR"
layout.separator()
@ -3368,33 +3386,16 @@ class VIEW3D_MT_mask(Menu):
layout.separator()
props = layout.operator("sculpt.expand", text="Expand Mask by Topology")
props.target = 'MASK'
props.falloff_type = 'GEODESIC'
props.invert = True
props = layout.operator("sculpt.expand", text="Expand Mask by Normals")
props.target = 'MASK'
props.falloff_type = 'NORMALS'
props.invert = False
layout.separator()
props = layout.operator("mesh.paint_mask_extract", text="Mask Extract")
layout.separator()
props = layout.operator("mesh.paint_mask_slice", text="Mask Slice")
props = layout.operator("mesh.paint_mask_slice", text="Slice Masked")
props.fill_holes = False
props.new_object = False
props = layout.operator("mesh.paint_mask_slice", text="Mask Slice and Fill Holes")
props = layout.operator("mesh.paint_mask_slice", text="Slice Masked and Fill Holes")
props.new_object = False
props = layout.operator("mesh.paint_mask_slice", text="Mask Slice to New Object")
layout.separator()
props = layout.operator("sculpt.mask_from_cavity", text="Mask From Cavity")
props.settings_source = "OPERATOR"
props = layout.operator("mesh.paint_mask_slice", text="Slice Masked to New Object")
layout.separator()

2
source/blender/editors/sculpt_paint/sculpt_ops.cc
View File

@ -968,7 +968,7 @@ static void SCULPT_OT_mask_by_color(wmOperatorType *ot)
ot->invoke = sculpt_mask_by_color_invoke;
ot->poll = SCULPT_mode_poll;
ot->flag = OPTYPE_REGISTER;
ot->flag = OPTYPE_REGISTER | OPTYPE_DEPENDS_ON_CURSOR;
ot->prop = RNA_def_boolean(
ot->srna, "contiguous", false, "Contiguous", "Mask only contiguous color areas");