[Bf-blender-cvs] [f52023a85cb] soc-2020-io-performance: clang-tidy mismatched or missing arg names; else-after-return.

[Ankit Meel]

Commit: f52023a85cbb6e877feb1cc14f5a2a1d4546333f
Author: Ankit Meel
Date:   Thu Oct 15 17:39:37 2020 +0530
Branches: soc-2020-io-performance
https://developer.blender.org/rBf52023a85cbb6e877feb1cc14f5a2a1d4546333f

clang-tidy mismatched or missing arg names; else-after-return.

No functional change.

===================================================================

M	source/blender/io/wavefront_obj/exporter/obj_export_file_writer.cc
M	source/blender/io/wavefront_obj/exporter/obj_export_file_writer.hh
M	source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc

===================================================================

diff --git a/source/blender/io/wavefront_obj/exporter/obj_export_file_writer.cc b/source/blender/io/wavefront_obj/exporter/obj_export_file_writer.cc
index ee5fbf0b78c..dd903c861ba 100644
--- a/source/blender/io/wavefront_obj/exporter/obj_export_file_writer.cc
+++ b/source/blender/io/wavefront_obj/exporter/obj_export_file_writer.cc
@@ -76,7 +76,7 @@ void OBJWriter::write_vert_uv_normal_indices(Span<int> vert_indices,
  * Write one line of polygon indices as f v1//vn1 v2//vn2 ... .
  */
 void OBJWriter::write_vert_normal_indices(Span<int> vert_indices,
-                                          Span<int>,
+                                          Span<int> /*uv_indices*/,
                                           Span<int> normal_indices) const
 {
   BLI_assert(vert_indices.size() == normal_indices.size());
@@ -95,7 +95,7 @@ void OBJWriter::write_vert_normal_indices(Span<int> vert_indices,
  */
 void OBJWriter::write_vert_uv_indices(Span<int> vert_indices,
                                       Span<int> uv_indices,
-                                      Span<int>) const
+                                      Span<int> /*normal_indices*/) const
 {
   BLI_assert(vert_indices.size() == uv_indices.size());
   fputs("f", outfile_);
@@ -111,7 +111,9 @@ void OBJWriter::write_vert_uv_indices(Span<int> vert_indices,
 /**
  *  Write one line of polygon indices as f v1 v2 ... .
  */
-void OBJWriter::write_vert_indices(Span<int> vert_indices, Span<int>, Span<int>) const
+void OBJWriter::write_vert_indices(Span<int> vert_indices,
+                                   Span<int> /*uv_indices*/,
+                                   Span<int> /*normal_indices*/) const
 {
   fputs("f", outfile_);
   for (int j = 0; j < vert_indices.size(); j++) {
diff --git a/source/blender/io/wavefront_obj/exporter/obj_export_file_writer.hh b/source/blender/io/wavefront_obj/exporter/obj_export_file_writer.hh
index 332c30f3780..3c42c517b23 100644
--- a/source/blender/io/wavefront_obj/exporter/obj_export_file_writer.hh
+++ b/source/blender/io/wavefront_obj/exporter/obj_export_file_writer.hh
@@ -66,7 +66,7 @@ class OBJWriter {
 
   void write_object_name(const OBJMesh &obj_mesh_data) const;
   void write_object_group(const OBJMesh &obj_mesh_data) const;
-  void write_mtllib_name(const char *obj_filepath) const;
+  void write_mtllib_name(const char *mtl_filepath) const;
   void write_vertex_coords(const OBJMesh &obj_mesh_data) const;
   void write_uv_coords(OBJMesh &obj_mesh_data) const;
   void write_poly_normals(OBJMesh &obj_mesh_data) const;
@@ -78,7 +78,7 @@ class OBJWriter {
                            int16_t &r_last_face_mat_nr) const;
   void write_vertex_group(const OBJMesh &obj_mesh_data,
                           const int poly_index,
-                          int16_t &r_last_face_vertex_group) const;
+                          int16_t &r_last_poly_vertex_group) const;
   void write_poly_elements(const OBJMesh &obj_mesh_data);
   void write_edges_indices(const OBJMesh &obj_mesh_data) const;
   void write_nurbs_curve(const OBJCurve &obj_nurbs_data) const;
@@ -86,7 +86,8 @@ class OBJWriter {
   void update_index_offsets(const OBJMesh &obj_mesh_data);
 
  private:
-  /* Based on export parameters, a writer function with appropriate OBJ syntax is needed. */
+  /* Based on export parameters, a writer function with appropriate
+   * OBJ polygon-element syntax is needed. */
   typedef void (OBJWriter::*func_vert_uv_normal_indices)(Span<int> vert_indices,
                                                          Span<int> uv_indices,
                                                          Span<int> normal_indices) const;
@@ -96,10 +97,14 @@ class OBJWriter {
                                     Span<int> uv_indices,
                                     Span<int> normal_indices) const;
   void write_vert_normal_indices(Span<int> vert_indices,
-                                 Span<int>,
+                                 Span<int> /*uv_indices*/,
                                  Span<int> normal_indices) const;
-  void write_vert_uv_indices(Span<int> vert_indices, Span<int> uv_indices, Span<int>) const;
-  void write_vert_indices(Span<int> vert_indices, Span<int>, Span<int>) const;
+  void write_vert_uv_indices(Span<int> vert_indices,
+                             Span<int> uv_indices,
+                             Span<int> /*normal_indices*/) const;
+  void write_vert_indices(Span<int> vert_indices,
+                          Span<int> /*uv_indices*/,
+                          Span<int> /*normal_indices*/) const;
 };
 
 /**
diff --git a/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc b/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc
index e5e8e1a1cb9..286f48922ef 100644
--- a/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc
+++ b/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc
@@ -419,13 +419,11 @@ int OBJMesh::calc_poly_normal_indices(const int poly_index,
     /* For a smooth-shaded face, `Mesh.totloop`-many loop normals are written. */
     return totloop;
   }
-  else {
-    for (int face_loop_index = 0; face_loop_index < totloop; face_loop_index++) {
-      r_face_normal_indices[face_loop_index] = object_tot_prev_normals;
-    }
-    /* For a flat-shaded face, one face normal is written.  */
-    return 1;
+  for (int face_loop_index = 0; face_loop_index < totloop; face_loop_index++) {
+    r_face_normal_indices[face_loop_index] = object_tot_prev_normals;
   }
+  /* For a flat-shaded face, one face normal is written.  */
+  return 1;
 }
 
 /**