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

Cleanup: Reduce indentation in function

This commit is contained in:
Hans Goudey 2020-08-03 17:40:07 -04:00
parent 452b896f2d
commit 862d79fffc
2 changed files with 61 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
source/blender/bmesh/tools/bmesh_bevel.c
View File

@ -7143,68 +7143,67 @@ static float find_profile_fullness(BevelParams *bp)
*/
static void set_profile_spacing(BevelParams *bp, ProfileSpacing *pro_spacing, bool custom)
{
int seg, seg_2;
int seg = bp->seg;
seg = bp->seg;
seg_2 = power_of_2_max_i(bp->seg);
if (seg > 1) {
/* Sample the input number of segments. */
pro_spacing->xvals = (double *)BLI_memarena_alloc(bp->mem_arena,
(size_t)(seg + 1) * sizeof(double));
pro_spacing->yvals = (double *)BLI_memarena_alloc(bp->mem_arena,
(size_t)(seg + 1) * sizeof(double));
if (custom) {
/* Make sure the curve profile's sample table is full. */
if (bp->custom_profile->segments_len != seg || !bp->custom_profile->segments) {
BKE_curveprofile_init((CurveProfile *)bp->custom_profile, (short)seg);
}
/* Copy segment locations into the profile spacing struct. */
for (int i = 0; i < seg + 1; i++) {
pro_spacing->xvals[i] = (double)bp->custom_profile->segments[i].y;
pro_spacing->yvals[i] = (double)bp->custom_profile->segments[i].x;
}
}
else {
find_even_superellipse_chords(seg, bp->pro_super_r, pro_spacing->xvals, pro_spacing->yvals);
}
/* Sample the seg_2 segments used for subdividing the vertex meshes. */
if (seg_2 == 2) {
seg_2 = 4;
}
bp->pro_spacing.seg_2 = seg_2;
if (seg_2 == seg) {
pro_spacing->xvals_2 = pro_spacing->xvals;
pro_spacing->yvals_2 = pro_spacing->yvals;
}
else {
pro_spacing->xvals_2 = (double *)BLI_memarena_alloc(bp->mem_arena,
(size_t)(seg_2 + 1) * sizeof(double));
pro_spacing->yvals_2 = (double *)BLI_memarena_alloc(bp->mem_arena,
(size_t)(seg_2 + 1) * sizeof(double));
if (custom) {
/* Make sure the curve profile widget's sample table is full of the seg_2 samples. */
BKE_curveprofile_init((CurveProfile *)bp->custom_profile, (short)seg_2);
/* Copy segment locations into the profile spacing struct. */
for (int i = 0; i < seg_2 + 1; i++) {
pro_spacing->xvals_2[i] = (double)bp->custom_profile->segments[i].y;
pro_spacing->yvals_2[i] = (double)bp->custom_profile->segments[i].x;
}
}
else {
find_even_superellipse_chords(
seg_2, bp->pro_super_r, pro_spacing->xvals_2, pro_spacing->yvals_2);
}
}
}
else { /* Only 1 segment, we don't need any profile information. */
if (seg <= 1) {
/* Only 1 segment, we don't need any profile information. */
pro_spacing->xvals = NULL;
pro_spacing->yvals = NULL;
pro_spacing->xvals_2 = NULL;
pro_spacing->yvals_2 = NULL;
pro_spacing->seg_2 = 0;
return;
}
int seg_2 = power_of_2_max_i(bp->seg);
/* Sample the input number of segments. */
pro_spacing->xvals = (double *)BLI_memarena_alloc(bp->mem_arena, sizeof(double) * (seg + 1));
pro_spacing->yvals = (double *)BLI_memarena_alloc(bp->mem_arena, sizeof(double) * (seg + 1));
if (custom) {
/* Make sure the curve profile's sample table is full. */
if (bp->custom_profile->segments_len != seg || !bp->custom_profile->segments) {
BKE_curveprofile_init((CurveProfile *)bp->custom_profile, (short)seg);
}
/* Copy segment locations into the profile spacing struct. */
for (int i = 0; i < seg + 1; i++) {
pro_spacing->xvals[i] = (double)bp->custom_profile->segments[i].y;
pro_spacing->yvals[i] = (double)bp->custom_profile->segments[i].x;
}
}
else {
find_even_superellipse_chords(seg, bp->pro_super_r, pro_spacing->xvals, pro_spacing->yvals);
}
/* Sample the seg_2 segments used during vertex mesh subdivision. */
if (seg_2 == 2) {
seg_2 = 4;
}
bp->pro_spacing.seg_2 = seg_2;
if (seg_2 == seg) {
pro_spacing->xvals_2 = pro_spacing->xvals;
pro_spacing->yvals_2 = pro_spacing->yvals;
}
else {
pro_spacing->xvals_2 = (double *)BLI_memarena_alloc(bp->mem_arena,
sizeof(double) * (seg_2 + 1));
pro_spacing->yvals_2 = (double *)BLI_memarena_alloc(bp->mem_arena,
sizeof(double) * (seg_2 + 1));
if (custom) {
/* Make sure the curve profile widget's sample table is full of the seg_2 samples. */
BKE_curveprofile_init((CurveProfile *)bp->custom_profile, (short)seg_2);
/* Copy segment locations into the profile spacing struct. */
for (int i = 0; i < seg_2 + 1; i++) {
pro_spacing->xvals_2[i] = (double)bp->custom_profile->segments[i].y;
pro_spacing->yvals_2[i] = (double)bp->custom_profile->segments[i].x;
}
}
else {
find_even_superellipse_chords(
seg_2, bp->pro_super_r, pro_spacing->xvals_2, pro_spacing->yvals_2);
}
}
}

12
source/blender/editors/mesh/editmesh_bevel.c
View File

@ -1158,12 +1158,12 @@ void MESH_OT_bevel(wmOperatorType *ot)
PROFILE_HARD_MIN,
1.0f);
prop = RNA_def_enum(ot->srna,
"affect",
prop_affect_items,
BEVEL_AFFECT_EDGES,
"Affect",
"Affect Edges or Vertices");
RNA_def_enum(ot->srna,
"affect",
prop_affect_items,
BEVEL_AFFECT_EDGES,
"Affect",
"Affect Edges or Vertices");
RNA_def_boolean(ot->srna,
"clamp_overlap",