blender
/
blender
134
399
Fork 581
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

WIP: Issue Sculpt Mode: Cavity Inverted consistency #102437 #105718

Draft
ProCrow wants to merge 1 commits from ProCrow/blender:my-feature into main
pull from: ProCrow/blender:my-feature
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 1 Commits 1 Files Changed 2 +3 -4
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7882,10 +7882,9 @@ class VIEW3D_PT_sculpt_automasking(Panel):
props = row.operator("sculpt.mask_from_cavity", text="Create Mask")
props.settings_source = "SCENE"
col.prop(sculpt, "use_automasking_cavity_inverted", text="Cavity (inverted)")
if is_cavity_active:
col = layout.column(align=True)
col.prop(sculpt, "use_automasking_cavity_inverted", text="Inverted")
col.prop(sculpt, "automasking_cavity_factor", text="Factor")
col.prop(sculpt, "automasking_cavity_blur_steps", text="Blur")

4
source/blender/makesrna/intern/rna_sculpt_paint.c
View File

@ -569,7 +569,7 @@ static void rna_Sculpt_automasking_invert_cavity_set(PointerRNA *ptr, bool val)
Sculpt *sd = (Sculpt *)ptr->data;
if (val) {
sd->automasking_flags &= ~BRUSH_AUTOMASKING_CAVITY_NORMAL;
sd->automasking_flags |= BRUSH_AUTOMASKING_CAVITY_NORMAL;
sd->automasking_flags |= BRUSH_AUTOMASKING_CAVITY_INVERTED;
}
else {
@ -582,11 +582,11 @@ static void rna_Sculpt_automasking_cavity_set(PointerRNA *ptr, bool val)
Sculpt *sd = (Sculpt *)ptr->data;
if (val) {
sd->automasking_flags &= ~BRUSH_AUTOMASKING_CAVITY_INVERTED;
sd->automasking_flags |= BRUSH_AUTOMASKING_CAVITY_NORMAL;
}
else {
sd->automasking_flags &= ~BRUSH_AUTOMASKING_CAVITY_NORMAL;
sd->automasking_flags &= ~BRUSH_AUTOMASKING_CAVITY_INVERTED;
}
}
#else