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

Cleanup: Use enum class and constexpr in sculpt_automask.cc

Browse Source 
Pull Request: https://projects.blender.org/blender/blender/pulls/126111
This commit is contained in:
Sean Kim
2024-08-20 20:53:55 +02:00
committed by Sean Kim
parent 1ba82ed139
commit 858f91b2aa
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -849,14 +849,14 @@ static void init_face_sets_masking(const Sculpt &sd, Object &ob)
}
}
#define EDGE_DISTANCE_INF -1
static constexpr int EDGE_DISTANCE_INF = -1;
enum eBoundaryAutomaskMode {
AUTOMASK_INIT_BOUNDARY_EDGES = 1,
AUTOMASK_INIT_BOUNDARY_FACE_SETS = 2,
enum class BoundaryAutomaskMode {
Edges = 1,
FaceSets = 2,
};
static void init_boundary_masking(Object &ob, eBoundaryAutomaskMode mode, int propagation_steps)
static void init_boundary_masking(Object &ob, BoundaryAutomaskMode mode, int propagation_steps)
{
SculptSession &ss = *ob.sculpt;
@@ -868,12 +868,12 @@ static void init_boundary_masking(Object &ob, eBoundaryAutomaskMode mode, int pr
edge_distance[i] = EDGE_DISTANCE_INF;
switch (mode) {
case AUTOMASK_INIT_BOUNDARY_EDGES:
case BoundaryAutomaskMode::Edges:
if (boundary::vert_is_boundary(ss, vertex)) {
edge_distance[i] = 0;
}
break;
case AUTOMASK_INIT_BOUNDARY_FACE_SETS:
case BoundaryAutomaskMode::FaceSets:
if (!face_set::vert_has_unique_face_set(ss, vertex)) {
edge_distance[i] = 0;
}
@@ -1123,11 +1123,11 @@ std::unique_ptr<Cache> cache_init(const Depsgraph &depsgraph,
const int steps = boundary_propagation_steps(sd, brush);
if (mode_enabled(sd, brush, BRUSH_AUTOMASKING_BOUNDARY_EDGES)) {
SCULPT_vertex_random_access_ensure(ss);
init_boundary_masking(ob, AUTOMASK_INIT_BOUNDARY_EDGES, steps);
init_boundary_masking(ob, BoundaryAutomaskMode::Edges, steps);
}
if (mode_enabled(sd, brush, BRUSH_AUTOMASKING_BOUNDARY_FACE_SETS)) {
SCULPT_vertex_random_access_ensure(ss);
init_boundary_masking(ob, AUTOMASK_INIT_BOUNDARY_FACE_SETS, steps);
init_boundary_masking(ob, BoundaryAutomaskMode::FaceSets, steps);
}
/* Subtractive modes. */