[Bf-blender-cvs] [19fa6fd9f45] sculpt-dev: Cleanup: Clang format
Pablo Dobarro
noreply at git.blender.org
Wed Feb 3 01:26:42 CET 2021
Commit: 19fa6fd9f458b7294e445eb5d5d9bf12e15b5f0b
Author: Pablo Dobarro
Date: Wed Feb 3 01:26:24 2021 +0100
Branches: sculpt-dev
https://developer.blender.org/rB19fa6fd9f458b7294e445eb5d5d9bf12e15b5f0b
Cleanup: Clang format
===================================================================
M source/blender/editors/sculpt_paint/sculpt_expand.c
M source/blender/editors/sculpt_paint/sculpt_face_set.c
===================================================================
diff --git a/source/blender/editors/sculpt_paint/sculpt_expand.c b/source/blender/editors/sculpt_paint/sculpt_expand.c
index 2efc8944dff..46c65c744b1 100644
--- a/source/blender/editors/sculpt_paint/sculpt_expand.c
+++ b/source/blender/editors/sculpt_paint/sculpt_expand.c
@@ -640,7 +640,8 @@ static void sculpt_expand_initialize_from_face_set_boundary(Object *ob,
if (internal_falloff) {
for (int i = 0; i < totvert; i++) {
- if (!(SCULPT_vertex_has_face_set(ss, i, active_face_set) && SCULPT_vertex_has_unique_face_set(ss, i))) {
+ if (!(SCULPT_vertex_has_face_set(ss, i, active_face_set) &&
+ SCULPT_vertex_has_unique_face_set(ss, i))) {
continue;
}
expand_cache->falloff_factor[i] *= -1.0f;
@@ -1587,26 +1588,14 @@ void sculpt_expand_modal_keymap(wmKeyConfig *keyconf)
"Topology recursion Step",
""},
{SCULPT_EXPAND_MODAL_MOVE_TOGGLE, "MOVE_TOGGLE", 0, "Move the origin of the expand", ""},
- {SCULPT_EXPAND_MODAL_FALLOFF_GEODESIC,
- "FALLOFF_GEODESICS",
- 0,
- "Geodesic Falloff",
- ""},
- {SCULPT_EXPAND_MODAL_FALLOFF_TOPOLOGY,
- "FALLOFF_TOPOLOGY",
- 0,
- "Topology Falloff",
- ""},
+ {SCULPT_EXPAND_MODAL_FALLOFF_GEODESIC, "FALLOFF_GEODESICS", 0, "Geodesic Falloff", ""},
+ {SCULPT_EXPAND_MODAL_FALLOFF_TOPOLOGY, "FALLOFF_TOPOLOGY", 0, "Topology Falloff", ""},
{SCULPT_EXPAND_MODAL_FALLOFF_TOPOLOGY_DIAGONALS,
"FALLOFF_TOPOLOGY_DIAGONALS",
0,
"Diagonals Falloff",
""},
- {SCULPT_EXPAND_MODAL_FALLOFF_SPHERICAL,
- "FALLOFF_SPHERICAL",
- 0,
- "Spherical Falloff",
- ""},
+ {SCULPT_EXPAND_MODAL_FALLOFF_SPHERICAL, "FALLOFF_SPHERICAL", 0, "Spherical Falloff", ""},
{SCULPT_EXPAND_MODAL_SNAP_TOGGLE, "SNAP_TOGGLE", 0, "Snap expand to Face Sets", ""},
{SCULPT_EXPAND_MODAL_LOOP_COUNT_INCREASE,
"LOOP_COUNT_INCREASE",
diff --git a/source/blender/editors/sculpt_paint/sculpt_face_set.c b/source/blender/editors/sculpt_paint/sculpt_face_set.c
index 9220e77bcaf..f8ceaab5d85 100644
--- a/source/blender/editors/sculpt_paint/sculpt_face_set.c
+++ b/source/blender/editors/sculpt_paint/sculpt_face_set.c
@@ -555,7 +555,8 @@ static bool sculpt_face_sets_init_face_set_boundary_test(
BMesh *bm, BMFace *from_f, BMEdge *UNUSED(from_e), BMFace *to_f, const float UNUSED(threshold))
{
const int cd_face_sets_offset = CustomData_get_offset(&bm->pdata, CD_SCULPT_FACE_SETS);
- return BM_ELEM_CD_GET_INT(from_f, cd_face_sets_offset) == BM_ELEM_CD_GET_INT(to_f, cd_face_sets_offset);
+ return BM_ELEM_CD_GET_INT(from_f, cd_face_sets_offset) ==
+ BM_ELEM_CD_GET_INT(to_f, cd_face_sets_offset);
}
static bool sculpt_face_sets_init_sharp_edges_test(BMesh *UNUSED(bm),
@@ -731,7 +732,8 @@ static int sculpt_face_set_init_exec(bContext *C, wmOperator *op)
sculpt_face_sets_init_flood_fill(ob, sculpt_face_sets_init_bevel_weight_test, threshold);
break;
case SCULPT_FACE_SETS_FROM_FACE_SET_BOUNDARIES:
- sculpt_face_sets_init_flood_fill(ob, sculpt_face_sets_init_face_set_boundary_test, threshold);
+ sculpt_face_sets_init_flood_fill(
+ ob, sculpt_face_sets_init_face_set_boundary_test, threshold);
break;
case SCULPT_FACE_SETS_FROM_FACE_MAPS:
sculpt_face_sets_init_loop(ob, SCULPT_FACE_SETS_FROM_FACE_MAPS);
More information about the Bf-blender-cvs
mailing list