blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 779 Projects 19 Wiki Activity

Sculpt: Add global automasking propagation steps #117316

Merged
Hans Goudey merged 8 commits from Sean-Kim/blender:102377-auto-masking into main 2024-01-29 15:39:50 +01:00
Conversation 2 Commits 8 Files Changed 10 +14 -8
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit db184fd490 - Show all commits

2
source/blender/blenloader/intern/versioning_defaults.cc
View File

@ -384,8 +384,6 @@ static void blo_update_defaults_scene(Main *bmain, Scene *scene)
IDP_ClearProperty(idprop);
}
/* Ensure sculpt-mode global automasking_boundary_edges_propagation_steps is defaulted
* correctly.*/
if (ts->sculpt) {
Sean-Kim marked this conversation as resolved
Hans Goudey commented 2024-01-19 19:29:00 +01:00
Review
Copy Link

This is basically the point of this function, so this comment isn't adding much. I'd suggest removing it.

This is basically the point of this function, so this comment isn't adding much. I'd suggest removing it.
👍 1
ts->sculpt->automasking_boundary_edges_propagation_steps = 1;
}

20
source/blender/editors/sculpt_paint/sculpt_automasking.cc
View File

@ -204,8 +204,6 @@ static bool needs_factors_cache(const Sculpt *sd, const Brush *brush)
return true;
}
/* TODO: I'm unsure why the BRUSH_AUTOMASKING_VIEW_NORMAL cares at all about the propagation
* steps being non 1, should this only check for brush being non-nullptr? */
if (automasking_flags & BRUSH_AUTOMASKING_VIEW_NORMAL) {
return brush && brush->automasking_boundary_edges_propagation_steps != 1;
}
Sean-Kim marked this conversation as resolved Outdated
Hans Goudey commented 2024-01-19 19:27:34 +01:00
Outdated
Review
Copy Link

Agreed, but how about handling that in a separate PR?

Agreed, but how about handling that in a separate PR?
👍 1
@ -807,6 +805,7 @@ bool tool_can_reuse_automask(int sculpt_tool)
std::unique_ptr<Cache> cache_init(Sculpt *sd, Brush *brush, Object *ob)
{
SculptSession *ss = ob->sculpt;
const int totvert = SCULPT_vertex_count_get(ss);
if (!is_enabled(sd, ss, brush)) {
return nullptr;
@ -899,10 +898,19 @@ std::unique_ptr<Cache> cache_init(Sculpt *sd, Brush *brush, Object *ob)
SCULPT_ATTRIBUTE_NAME(automasking_factor),
&params);
/* Topology builds up the mask from zero which other modes can subtract from.
* If it isn't enabled, initialize to 1. */
float initial_value = !(mode & BRUSH_AUTOMASKING_TOPOLOGY) ? 1.0f : 0.0f;
const int totvert = SCULPT_vertex_count_get(ss);
float initial_value;
/* Topology, boundary and boundary face sets build up the mask
* from zero which other modes can subtract from. If none of them are
* enabled initialize to 1.
*/
if (!(mode & BRUSH_AUTOMASKING_TOPOLOGY)) {
initial_value = 1.0f;
}
else {
initial_value = 0.0f;
}
for (int i : IndexRange(totvert)) {
PBVHVertRef vertex = BKE_pbvh_index_to_vertex(ss->pbvh, i);