[Bf-blender-cvs] [12237829767] soc-2020-io-performance: Cleanup: importer: const, range-based for-loops, etc.
Ankit Meel
noreply at git.blender.org
Wed Nov 11 15:37:33 CET 2020
Commit: 122378297677fb10aeb010addd51fcb9f66a917b
Author: Ankit Meel
Date: Sun Nov 8 19:01:54 2020 +0530
Branches: soc-2020-io-performance
https://developer.blender.org/rB122378297677fb10aeb010addd51fcb9f66a917b
Cleanup: importer: const, range-based for-loops, etc.
===================================================================
M source/blender/io/wavefront_obj/importer/importer_mesh_utils.cc
M source/blender/io/wavefront_obj/importer/obj_import_mesh.cc
===================================================================
diff --git a/source/blender/io/wavefront_obj/importer/importer_mesh_utils.cc b/source/blender/io/wavefront_obj/importer/importer_mesh_utils.cc
index faf62e097c5..7b46b812551 100644
--- a/source/blender/io/wavefront_obj/importer/importer_mesh_utils.cc
+++ b/source/blender/io/wavefront_obj/importer/importer_mesh_utils.cc
@@ -307,11 +307,10 @@ Vector<Vector<int>> ngon_tessellate(Span<float3> vertex_coords, Span<int> face_v
}
}
if (flip == 1) {
- for (int i = 0; i < fill_indices.size(); i++) {
- Span<int> fi = fill_indices[i];
- Vector<int> rev_face(fi.size());
+ for (Span<int> fill_index : fill_indices) {
+ Vector<int> rev_face(fill_index.size());
for (int j = 0; j < rev_face.size(); j++) {
- rev_face[j] = fi[rev_face.size() - 1 - j];
+ rev_face[j] = fill_index[rev_face.size() - 1 - j];
}
fill_indices_reversed.append(rev_face);
}
@@ -349,10 +348,10 @@ void transform_object(Object *object, const OBJImportParams &import_params)
float3 max_coord(-INT_MAX);
float3 min_coord(INT_MAX);
BoundBox *bb = BKE_mesh_boundbox_get(object);
- for (int i = 0; i < 8; i++) {
- for (int j = 0; j < 3; j++) {
- max_coord[j] = max_ff(max_coord[j], bb->vec[i][j]);
- min_coord[j] = min_ff(min_coord[j], bb->vec[i][j]);
+ for (const float (&vertex)[3] : bb->vec) {
+ for (int axis = 0; axis < 3; axis++) {
+ max_coord[axis] = max_ff(max_coord[axis], vertex[axis]);
+ min_coord[axis] = min_ff(min_coord[axis], vertex[axis]);
}
}
const float max_diff = max_fff(
diff --git a/source/blender/io/wavefront_obj/importer/obj_import_mesh.cc b/source/blender/io/wavefront_obj/importer/obj_import_mesh.cc
index c63edd1939a..a0224bc134d 100644
--- a/source/blender/io/wavefront_obj/importer/obj_import_mesh.cc
+++ b/source/blender/io/wavefront_obj/importer/obj_import_mesh.cc
@@ -184,9 +184,9 @@ void MeshFromGeometry::dissolve_edges(const Set<std::pair<int, int>> &fgon_edges
if (fgon_edges.is_empty()) {
return;
}
- struct BMeshCreateParams bm_create_params = {true};
+ const struct BMeshCreateParams bm_create_params = {1u};
/* If calc_face_normal is false, it triggers BLI_assert(BM_face_is_normal_valid(f)). */
- struct BMeshFromMeshParams bm_convert_params = {true, 0, 0, 0};
+ const struct BMeshFromMeshParams bm_convert_params = {1u, 0, 0, 0};
BMesh *bmesh = BKE_mesh_to_bmesh_ex(blender_mesh_.get(), &bm_create_params, &bm_convert_params);
@@ -201,8 +201,8 @@ void MeshFromGeometry::dissolve_edges(const Set<std::pair<int, int>> &fgon_edges
BMO_FLAG_DEFAULTS,
"dissolve_edges edges=%eb use_verts=%b use_face_split=%b",
edges.data(),
- false,
- false);
+ 0,
+ 0);
unique_mesh_ptr to_free = std::move(blender_mesh_);
blender_mesh_.reset(BKE_mesh_from_bmesh_for_eval_nomain(bmesh, nullptr, to_free.get()));
to_free.reset();
More information about the Bf-blender-cvs
mailing list