diff options
author | Campbell Barton <campbell@blender.org> | 2022-09-30 07:16:14 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-09-30 07:51:49 +0300 |
commit | 8bdd4b468554446cb1351785f0db751e2f84341f (patch) | |
tree | d81bda8a17f036de212b2982d7b13093f5b35a9e /source/blender/blenkernel/intern | |
parent | 1c1dc5f8440d918aca480904c53e31a528aef42f (diff) |
Cleanup: use function style casts for C++
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/brush.cc | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/curve.cc | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/customdata.cc | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/gpencil_geom.cc | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mesh_normals.cc | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/modifier.cc | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/scene.cc | 6 |
7 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/blenkernel/intern/brush.cc b/source/blender/blenkernel/intern/brush.cc index fb8a6785f64..7261e0a5869 100644 --- a/source/blender/blenkernel/intern/brush.cc +++ b/source/blender/blenkernel/intern/brush.cc @@ -2387,7 +2387,7 @@ void BKE_brush_scale_size(int *r_brush_size, if (old_unprojected_radius != 0) { scale /= new_unprojected_radius; } - (*r_brush_size) = (int)((float)(*r_brush_size) * scale); + (*r_brush_size) = int(float(*r_brush_size) * scale); } void BKE_brush_jitter_pos(const Scene *scene, Brush *brush, const float pos[2], float jitterpos[2]) diff --git a/source/blender/blenkernel/intern/curve.cc b/source/blender/blenkernel/intern/curve.cc index ddd1f000644..95ef94a6cd5 100644 --- a/source/blender/blenkernel/intern/curve.cc +++ b/source/blender/blenkernel/intern/curve.cc @@ -3085,7 +3085,7 @@ void BKE_curve_bevelList_make(Object *ob, const ListBase *nurbs, const bool for_ make_bevel_list_segment_3D(bl); } else { - make_bevel_list_3D(bl, (int)(resolu * cu->twist_smooth), cu->twist_mode); + make_bevel_list_3D(bl, int(resolu * cu->twist_smooth), cu->twist_mode); } } } diff --git a/source/blender/blenkernel/intern/customdata.cc b/source/blender/blenkernel/intern/customdata.cc index 4bbb9b62549..32a6bc6ecb9 100644 --- a/source/blender/blenkernel/intern/customdata.cc +++ b/source/blender/blenkernel/intern/customdata.cc @@ -5263,7 +5263,7 @@ static void blend_read_mdisps(BlendDataReader *reader, * overwritten with the correct value in * bm_corners_to_loops() */ float gridsize = sqrtf(mdisps[i].totdisp); - mdisps[i].level = (int)(logf(gridsize - 1.0f) / (float)M_LN2) + 1; + mdisps[i].level = int(logf(gridsize - 1.0f) / float(M_LN2)) + 1; } if (BLO_read_requires_endian_switch(reader) && (mdisps[i].disps)) { diff --git a/source/blender/blenkernel/intern/gpencil_geom.cc b/source/blender/blenkernel/intern/gpencil_geom.cc index fe5e656d55d..92b11ecaa61 100644 --- a/source/blender/blenkernel/intern/gpencil_geom.cc +++ b/source/blender/blenkernel/intern/gpencil_geom.cc @@ -3861,7 +3861,7 @@ static int generate_arc_from_point_to_point(ListBase *list, /* Number of points is 2^(n+1) + 1 on half a circle (n=subdivisions) * so we multiply by (angle / pi) to get the right amount of * points to insert. */ - int num_points = (int)(((1 << (subdivisions + 1)) - 1) * (angle / M_PI)); + int num_points = int(((1 << (subdivisions + 1)) - 1) * (angle / M_PI)); if (num_points > 0) { float angle_incr = angle / float(num_points); diff --git a/source/blender/blenkernel/intern/mesh_normals.cc b/source/blender/blenkernel/intern/mesh_normals.cc index 154840e2ef7..55d83b64e39 100644 --- a/source/blender/blenkernel/intern/mesh_normals.cc +++ b/source/blender/blenkernel/intern/mesh_normals.cc @@ -1678,7 +1678,7 @@ void BKE_mesh_normals_loop_split(const MVert *mverts, size_t(numLoops), sizeof(*loop_to_poly), __func__); /* When using custom loop normals, disable the angle feature! */ - const bool check_angle = (split_angle < (float)M_PI) && (clnors_data == nullptr); + const bool check_angle = (split_angle < float(M_PI)) && (clnors_data == nullptr); MLoopNorSpaceArray _lnors_spacearr = {nullptr}; @@ -1784,7 +1784,7 @@ static void mesh_normals_loop_custom_set(const MVert *mverts, /* In this case we always consider split nors as ON, * and do not want to use angle to define smooth fans! */ const bool use_split_normals = true; - const float split_angle = (float)M_PI; + const float split_angle = float(M_PI); BLI_SMALLSTACK_DECLARE(clnors_data, short *); diff --git a/source/blender/blenkernel/intern/modifier.cc b/source/blender/blenkernel/intern/modifier.cc index 7270f19a882..b3a61655635 100644 --- a/source/blender/blenkernel/intern/modifier.cc +++ b/source/blender/blenkernel/intern/modifier.cc @@ -350,7 +350,7 @@ void BKE_modifier_copydata_generic(const ModifierData *md_src, const char *md_src_data = ((const char *)md_src) + data_size; char *md_dst_data = ((char *)md_dst) + data_size; BLI_assert(data_size <= (size_t)mti->structSize); - memcpy(md_dst_data, md_src_data, (size_t)mti->structSize - data_size); + memcpy(md_dst_data, md_src_data, size_t(mti->structSize) - data_size); /* Runtime fields are never to be preserved. */ md_dst->runtime = nullptr; diff --git a/source/blender/blenkernel/intern/scene.cc b/source/blender/blenkernel/intern/scene.cc index 4af6409347d..2489c64ba0a 100644 --- a/source/blender/blenkernel/intern/scene.cc +++ b/source/blender/blenkernel/intern/scene.cc @@ -2331,7 +2331,7 @@ Object *BKE_scene_camera_switch_find(Scene *scene) return nullptr; } - const int ctime = (int)BKE_scene_ctime_get(scene); + const int ctime = int(BKE_scene_ctime_get(scene)); int frame = -(MAXFRAME + 1); int min_frame = MAXFRAME + 1; Object *camera = nullptr; @@ -2872,10 +2872,10 @@ int get_render_child_particle_number(const RenderData *r, int child_num, bool fo { if (r->mode & R_SIMPLIFY) { if (for_render) { - return (int)(r->simplify_particles_render * child_num); + return int(r->simplify_particles_render * child_num); } - return (int)(r->simplify_particles * child_num); + return int(r->simplify_particles * child_num); } return child_num; |