blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

Cleanup: Clang format

This commit is contained in:
Pablo Dobarro 2021-02-03 01:26:24 +01:00
parent 88921150ff
commit 19fa6fd9f4
2 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
source/blender/editors/sculpt_paint/sculpt_expand.c
View File

@ -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",

6
source/blender/editors/sculpt_paint/sculpt_face_set.c
View File

@ -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);