diff options
author | Campbell Barton <campbell@blender.org> | 2022-10-07 14:52:52 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-10-07 14:55:03 +0300 |
commit | 11abeae99fdbfc8f047c4a3c1d2b9b8c47883516 (patch) | |
tree | be27c71b34cba12adf64fa94204a3725cf9cfeee /source/blender/blenkernel/intern | |
parent | 9dec9eee0d38b32ba4254b624c7a27dc22fc4302 (diff) |
Cleanup: use function style casts for C++
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/object_dupli.cc | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/shrinkwrap.cc | 6 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/subdiv_ccg.cc | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/blenkernel/intern/object_dupli.cc b/source/blender/blenkernel/intern/object_dupli.cc index 1b315d29923..a56176b7d9b 100644 --- a/source/blender/blenkernel/intern/object_dupli.cc +++ b/source/blender/blenkernel/intern/object_dupli.cc @@ -1840,7 +1840,7 @@ static bool find_rna_property_rgba(PointerRNA *id_ptr, const char *name, float r value = RNA_property_float_get(&ptr, prop); } else if (type == PROP_INT) { - value = static_cast<float>(RNA_property_int_get(&ptr, prop)); + value = float(RNA_property_int_get(&ptr, prop)); } else if (type == PROP_BOOLEAN) { value = RNA_property_boolean_get(&ptr, prop) ? 1.0f : 0.0f; @@ -1863,7 +1863,7 @@ static bool find_rna_property_rgba(PointerRNA *id_ptr, const char *name, float r int tmp[4] = {0, 0, 0, 1}; RNA_property_int_get_array(&ptr, prop, tmp); for (int i = 0; i < 4; i++) { - r_data[i] = static_cast<float>(tmp[i]); + r_data[i] = float(tmp[i]); } return true; } diff --git a/source/blender/blenkernel/intern/shrinkwrap.cc b/source/blender/blenkernel/intern/shrinkwrap.cc index 91683788422..703b012d170 100644 --- a/source/blender/blenkernel/intern/shrinkwrap.cc +++ b/source/blender/blenkernel/intern/shrinkwrap.cc @@ -199,7 +199,7 @@ static ShrinkwrapBoundaryData *shrinkwrap_build_boundary_data(Mesh *mesh) /* Count faces per edge (up to 2). */ char *edge_mode = static_cast<char *>( - MEM_calloc_arrayN((size_t)mesh->totedge, sizeof(char), __func__)); + MEM_calloc_arrayN(size_t(mesh->totedge), sizeof(char), __func__)); for (int i = 0; i < mesh->totloop; i++) { uint eidx = mloop[i].e; @@ -258,7 +258,7 @@ static ShrinkwrapBoundaryData *shrinkwrap_build_boundary_data(Mesh *mesh) /* Find boundary vertices and build a mapping table for compact storage of data. */ int *vert_boundary_id = static_cast<int *>( - MEM_calloc_arrayN((size_t)mesh->totvert, sizeof(int), __func__)); + MEM_calloc_arrayN(size_t(mesh->totvert), sizeof(int), __func__)); for (int i = 0; i < mesh->totedge; i++) { if (edge_mode[i]) { @@ -272,7 +272,7 @@ static ShrinkwrapBoundaryData *shrinkwrap_build_boundary_data(Mesh *mesh) uint num_boundary_verts = 0; for (int i = 0; i < mesh->totvert; i++) { - vert_boundary_id[i] = (vert_boundary_id[i] != 0) ? (int)num_boundary_verts++ : -1; + vert_boundary_id[i] = (vert_boundary_id[i] != 0) ? int(num_boundary_verts++) : -1; } data->vert_boundary_id = vert_boundary_id; diff --git a/source/blender/blenkernel/intern/subdiv_ccg.cc b/source/blender/blenkernel/intern/subdiv_ccg.cc index 704e0690892..f84f15c749b 100644 --- a/source/blender/blenkernel/intern/subdiv_ccg.cc +++ b/source/blender/blenkernel/intern/subdiv_ccg.cc @@ -129,8 +129,8 @@ static void subdiv_ccg_alloc_elements(SubdivCCG *subdiv_ccg, Subdiv *subdiv) subdiv_ccg->grids = static_cast<CCGElem **>( MEM_calloc_arrayN(num_grids, sizeof(CCGElem *), "subdiv ccg grids")); subdiv_ccg->grids_storage = static_cast<unsigned char *>(MEM_calloc_arrayN( - num_grids, ((size_t)grid_area) * element_size, "subdiv ccg grids storage")); - const size_t grid_size_in_bytes = (size_t)grid_area * element_size; + num_grids, (size_t(grid_area)) * element_size, "subdiv ccg grids storage")); + const size_t grid_size_in_bytes = size_t(grid_area) * element_size; for (int grid_index = 0; grid_index < num_grids; grid_index++) { const size_t grid_offset = grid_size_in_bytes * grid_index; subdiv_ccg->grids[grid_index] = (CCGElem *)&subdiv_ccg->grids_storage[grid_offset]; @@ -241,7 +241,7 @@ static void subdiv_ccg_eval_regular_grid(CCGEvalGridsData *data, const int face_ const float grid_u = x * grid_size_1_inv; float u, v; BKE_subdiv_rotate_grid_to_quad(corner, grid_u, grid_v, &u, &v); - const size_t grid_element_index = (size_t)y * grid_size + x; + const size_t grid_element_index = size_t(y) * grid_size + x; const size_t grid_element_offset = grid_element_index * element_size; subdiv_ccg_eval_grid_element(data, ptex_face_index, u, v, &grid[grid_element_offset]); } @@ -271,7 +271,7 @@ static void subdiv_ccg_eval_special_grid(CCGEvalGridsData *data, const int face_ const float u = 1.0f - (y * grid_size_1_inv); for (int x = 0; x < grid_size; x++) { const float v = 1.0f - (x * grid_size_1_inv); - const size_t grid_element_index = (size_t)y * grid_size + x; + const size_t grid_element_index = size_t(y) * grid_size + x; const size_t grid_element_offset = grid_element_index * element_size; subdiv_ccg_eval_grid_element(data, ptex_face_index, u, v, &grid[grid_element_offset]); } |