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

Cleanup: Use switch instead of if / else for set_pivot cases

Browse Source 
Also ensures the case ordering is the same as the enum declaration

Pull Request: https://projects.blender.org/blender/blender/pulls/143678
This commit is contained in:
Sean Kim
2025-07-30 17:37:55 -07:00
committed by Gitea
parent bc17734177
commit 193b91e04c
1 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
source/blender/editors/sculpt_paint/sculpt_transform.cc
View File

@@ -927,29 +927,33 @@ static wmOperatorStatus set_pivot_position_exec(bContext *C, wmOperator *op)
BKE_sculpt_update_object_for_edit(depsgraph, &ob, false);
if (mode == PivotPositionMode::Origin) {
ss.pivot_pos = float3(0.0f);
}
else if (mode == PivotPositionMode::ActiveVert) {
const float2 mval(RNA_float_get(op->ptr, "mouse_x"), RNA_float_get(op->ptr, "mouse_y"));
CursorGeometryInfo cgi;
if (cursor_geometry_info_update(C, &cgi, mval, false)) {
copy_v3_v3(ss.pivot_pos, ss.active_vert_position(*depsgraph, ob));
switch (mode) {
case PivotPositionMode::Origin:
ss.pivot_pos = float3(0.0f);
break;
case PivotPositionMode::Unmasked:
ss.pivot_pos = average_unmasked_position(*depsgraph, ob, ss.pivot_pos, symm);
break;
case PivotPositionMode::MaskBorder:
ss.pivot_pos = average_mask_border_position(*depsgraph, ob, ss.pivot_pos, symm);
break;
case PivotPositionMode::ActiveVert: {
const float2 mval(RNA_float_get(op->ptr, "mouse_x"), RNA_float_get(op->ptr, "mouse_y"));
CursorGeometryInfo cgi;
if (cursor_geometry_info_update(C, &cgi, mval, false)) {
ss.pivot_pos = ss.active_vert_position(*depsgraph, ob);
}
break;
}
}
else if (mode == PivotPositionMode::CursorSurface) {
float3 stroke_location;
const float2 mval(RNA_float_get(op->ptr, "mouse_x"), RNA_float_get(op->ptr, "mouse_y"));
if (stroke_get_location_bvh(C, stroke_location, mval, false)) {
ss.pivot_pos = stroke_location;
case PivotPositionMode::CursorSurface: {
const float2 mval(RNA_float_get(op->ptr, "mouse_x"), RNA_float_get(op->ptr, "mouse_y"));
float3 stroke_location;
if (stroke_get_location_bvh(C, stroke_location, mval, false)) {
ss.pivot_pos = stroke_location;
}
break;
}
}
else if (mode == PivotPositionMode::Unmasked) {
ss.pivot_pos = average_unmasked_position(*depsgraph, ob, ss.pivot_pos, symm);
}
else {
ss.pivot_pos = average_mask_border_position(*depsgraph, ob, ss.pivot_pos, symm);
}
/* Update the viewport navigation rotation origin. */
Paint *paint = BKE_paint_get_active_from_context(C);