Commit: 7bd38c27761928f83d7228de11d205162ba4f00f Author: Ankit Meel Date: Wed Jul 22 03:04:53 2020 +0530 Branches: soc-2020-io-performance https://developer.blender.org/rB7bd38c27761928f83d7228de11d205162ba4f00f
Fix build errors: avoid `uint` with Vector size() function. https://wiki.blender.org/wiki/Style_Guide/C_Cpp#Integer_Types =================================================================== M source/blender/io/wavefront_obj/intern/wavefront_obj_ex_file_writer.cc M source/blender/io/wavefront_obj/intern/wavefront_obj_ex_mesh.cc M source/blender/io/wavefront_obj/intern/wavefront_obj_ex_mtl.cc M source/blender/io/wavefront_obj/intern/wavefront_obj_im_file_reader.hh M source/blender/io/wavefront_obj/intern/wavefront_obj_im_mesh.cc M source/blender/io/wavefront_obj/intern/wavefront_obj_im_nurbs.cc =================================================================== diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_ex_file_writer.cc b/source/blender/io/wavefront_obj/intern/wavefront_obj_ex_file_writer.cc index 333cd83c674..d96aea16f19 100644 --- a/source/blender/io/wavefront_obj/intern/wavefront_obj_ex_file_writer.cc +++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_ex_file_writer.cc @@ -174,8 +174,7 @@ void OBJWriter::write_uv_coords(OBJMesh &obj_mesh_data, Vector<Vector<uint>> &uv Vector<std::array<float, 2>> uv_coords; obj_mesh_data.store_uv_coords_and_indices(uv_coords, uv_indices); - for (uint i = 0; i < uv_coords.size(); i++) { - const std::array<float, 2> &uv_vertex = uv_coords[i]; + for (const std::array<float, 2> &uv_vertex : uv_coords) { fprintf(outfile_, "vt %f %f\n", uv_vertex[0], uv_vertex[1]); } } diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_ex_mesh.cc b/source/blender/io/wavefront_obj/intern/wavefront_obj_ex_mesh.cc index 82d5a2d0bff..318a164e794 100644 --- a/source/blender/io/wavefront_obj/intern/wavefront_obj_ex_mesh.cc +++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_ex_mesh.cc @@ -371,12 +371,12 @@ void OBJMesh::calc_poly_normal_indices(Vector<uint> &r_normal_indices, uint poly if (export_params_.export_smooth_groups && tot_smooth_groups_ > 0) { const MPoly &mpoly = export_mesh_eval_->mpoly[poly_index]; const MLoop *mloop = &export_mesh_eval_->mloop[mpoly.loopstart]; - for (uint i = 0; i < r_normal_indices.size(); i++) { + for (int i = 0; i < r_normal_indices.size(); i++) { r_normal_indices[i] = mloop[i].v + 1; } } else { - for (uint i = 0; i < r_normal_indices.size(); i++) { + for (int i = 0; i < r_normal_indices.size(); i++) { r_normal_indices[i] = poly_index + 1; } } diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_ex_mtl.cc b/source/blender/io/wavefront_obj/intern/wavefront_obj_ex_mtl.cc index 47972a48bde..bb0cdd55d56 100644 --- a/source/blender/io/wavefront_obj/intern/wavefront_obj_ex_mtl.cc +++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_ex_mtl.cc @@ -117,9 +117,7 @@ void MTLWriter::linked_sockets_to_dest_id(Vector<const nodes::OutputSocketRef *> if (dest_socket) { Span<const nodes::OutputSocketRef *> linked_sockets = dest_socket->directly_linked_sockets(); r_linked_sockets.resize(linked_sockets.size()); - for (uint i = 0; i < linked_sockets.size(); i++) { - r_linked_sockets[i] = linked_sockets[i]; - } + r_linked_sockets = linked_sockets; } else { r_linked_sockets.clear(); diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_im_file_reader.hh b/source/blender/io/wavefront_obj/intern/wavefront_obj_im_file_reader.hh index 0c1abc35d22..3897b71f640 100644 --- a/source/blender/io/wavefront_obj/intern/wavefront_obj_im_file_reader.hh +++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_im_file_reader.hh @@ -32,7 +32,7 @@ class OBJImporter { private: const OBJImportParams &import_params_; std::ifstream infile_; - uint index_offsets[2] = {0, 0}; + int index_offsets[2] = {0, 0}; public: OBJImporter(const OBJImportParams &import_params); diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_im_mesh.cc b/source/blender/io/wavefront_obj/intern/wavefront_obj_im_mesh.cc index fab4677c103..583b76eb35b 100644 --- a/source/blender/io/wavefront_obj/intern/wavefront_obj_im_mesh.cc +++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_im_mesh.cc @@ -36,9 +36,9 @@ namespace blender::io::obj { OBJMeshFromRaw::OBJMeshFromRaw(const OBJRawObject &curr_object, const GlobalVertices global_vertices) { - uint tot_verts_object{curr_object.vertex_indices.size()}; - uint tot_edges{curr_object.edges.size()}; - uint tot_face_elems{curr_object.face_elements.size()}; + const int64_t tot_verts_object{curr_object.vertex_indices.size()}; + const int64_t tot_edges{curr_object.edges.size()}; + const int64_t tot_face_elems{curr_object.face_elements.size()}; mesh_from_ob_.reset( BKE_mesh_new_nomain(tot_verts_object, tot_edges, 0, curr_object.tot_loop, tot_face_elems)); diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_im_nurbs.cc b/source/blender/io/wavefront_obj/intern/wavefront_obj_im_nurbs.cc index 59ac57a57bf..2bfb4b31a24 100644 --- a/source/blender/io/wavefront_obj/intern/wavefront_obj_im_nurbs.cc +++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_im_nurbs.cc @@ -33,7 +33,7 @@ namespace blender::io::obj { void OBJCurveFromRaw::edit_nurbs(const OBJRawObject &curr_object, const GlobalVertices &global_vertices) { - const uint tot_vert = curr_object.nurbs_element.curv_indices.size(); + const int64_t tot_vert{curr_object.nurbs_element.curv_indices.size()}; const NurbsElem &raw_nurbs = curr_object.nurbs_element; Nurb *nurb = (Nurb *)curve_from_ob_->nurb.first; _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
