diff options
author | Hans Goudey <h.goudey@me.com> | 2022-09-28 07:04:21 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2022-09-28 07:04:21 +0300 |
commit | c4b7ffa6f50c9680059fd221b5d7391fae6e6f29 (patch) | |
tree | 431834a347a5cab1347ff92eb7290a8cebe04079 /source/blender/editors/sculpt_paint/paint_vertex.cc | |
parent | 0f36ad24b5031f78664a935a3c483751e173e308 (diff) | |
parent | 788f3d72cf89c0301721a5eb2a72da07058dfa24 (diff) |
Merge branch 'master' into refactor-mesh-position-generic
Diffstat (limited to 'source/blender/editors/sculpt_paint/paint_vertex.cc')
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_vertex.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_vertex.cc b/source/blender/editors/sculpt_paint/paint_vertex.cc index 45c4d53aca8..298821803e4 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.cc +++ b/source/blender/editors/sculpt_paint/paint_vertex.cc @@ -171,8 +171,8 @@ static void view_angle_limits_init(NormalAnglePrecalc *a, float angle, bool do_m a->angle_inner = a->angle = angle; } - a->angle_inner *= (float)(M_PI_2 / 90); - a->angle *= (float)(M_PI_2 / 90); + a->angle_inner *= float(M_PI_2 / 90); + a->angle *= float(M_PI_2 / 90); a->angle_range = a->angle - a->angle_inner; if (a->angle_range <= 0.0f) { @@ -894,7 +894,7 @@ static void do_weight_paint_vertex_single( else { /* dv and dv_mirr are the same */ int totweight_prev = dv_mirr->totweight; - int dw_offset = (int)(dw - dv_mirr->dw); + int dw_offset = int(dw - dv_mirr->dw); dw_mirr = BKE_defvert_ensure_index(dv_mirr, vgroup_mirr); /* if we added another, get our old one back */ @@ -2128,7 +2128,7 @@ static void do_wpaint_brush_smear_task_cb_ex(void *__restrict userdata, } do_weight_paint_vertex( - data->vp, data->ob, data->wpi, v_index, final_alpha, (float)weight_final); + data->vp, data->ob, data->wpi, v_index, final_alpha, float(weight_final)); } } } @@ -2282,7 +2282,7 @@ static void calculate_average_weight(SculptThreadedTaskData *data, } if (accum_len != 0) { accum_weight /= accum_len; - data->strength = (float)accum_weight; + data->strength = float(accum_weight); } MEM_SAFE_FREE(data->custom_data); /* 'accum' */ @@ -2459,7 +2459,7 @@ static void wpaint_do_symmetrical_brush_actions( /* symm is a bit combination of XYZ - 1 is mirror * X; 2 is Y; 3 is XY; 4 is Z; 5 is XZ; 6 is YZ; 7 is XYZ */ for (i = 1; i <= symm; i++) { - if ((symm & i && (symm != 5 || i != 3) && (symm != 6 || (!ELEM(i, 3, 5))))) { + if (symm & i && (symm != 5 || i != 3) && (symm != 6 || !ELEM(i, 3, 5))) { cache->mirror_symmetry_pass = i; cache->radial_symmetry_pass = 0; SCULPT_cache_calc_brushdata_symm(cache, i, 0, 0); @@ -3807,7 +3807,7 @@ static void vpaint_do_symmetrical_brush_actions( /* symm is a bit combination of XYZ - 1 is mirror * X; 2 is Y; 3 is XY; 4 is Z; 5 is XZ; 6 is YZ; 7 is XYZ */ for (i = 1; i <= symm; i++) { - if (symm & i && (symm != 5 || i != 3) && (symm != 6 || (!ELEM(i, 3, 5)))) { + if (symm & i && (symm != 5 || i != 3) && (symm != 6 || !ELEM(i, 3, 5))) { cache->mirror_symmetry_pass = i; cache->radial_symmetry_pass = 0; SCULPT_cache_calc_brushdata_symm(cache, i, 0, 0); |