[Bf-blender-cvs] [a9cf4042237] soc-2020-io-performance: Cleanup: fix typos

[Ankit Meel]

Commit: a9cf40422375af986c011830a81c8939ffb34627
Author: Ankit Meel
Date:   Tue Dec 15 23:43:52 2020 +0530
Branches: soc-2020-io-performance
https://developer.blender.org/rBa9cf40422375af986c011830a81c8939ffb34627

Cleanup: fix typos

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

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_exporter.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 7a77095aad8..a79166b3d66 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
@@ -120,7 +120,7 @@ void OBJWriter::write_vert_indices(Span<int> vert_indices,
   file_handler_->write<eOBJSyntaxElement::poly_element_end>();
 }
 
-void OBJWriter::writer_header() const
+void OBJWriter::write_header() const
 {
   using namespace std::string_literals;
   file_handler_->write<eOBJSyntaxElement::string>("# Blender "s + BKE_blender_version_string() +
@@ -310,10 +310,10 @@ int16_t OBJWriter::write_vertex_group(const OBJMesh &obj_mesh_data,
  * \return Writer function with appropriate polygon-element syntax.
  */
 OBJWriter::func_vert_uv_normal_indices OBJWriter::get_poly_element_writer(
-    const OBJMesh &obj_mesh_data) const
+    const int total_uv_vertices) const
 {
   if (export_params_.export_normals) {
-    if (export_params_.export_uv && (obj_mesh_data.tot_uv_vertices() > 0)) {
+    if (export_params_.export_uv && (total_uv_vertices > 0)) {
       /* Write both normals and UV indices. */
       return &OBJWriter::write_vert_uv_normal_indices;
     }
@@ -321,7 +321,7 @@ OBJWriter::func_vert_uv_normal_indices OBJWriter::get_poly_element_writer(
     return &OBJWriter::write_vert_normal_indices;
   }
   /* Write UV indices. */
-  if (export_params_.export_uv && (obj_mesh_data.tot_uv_vertices() > 0)) {
+  if (export_params_.export_uv && (total_uv_vertices > 0)) {
     return &OBJWriter::write_vert_uv_indices;
   }
   /* Write neither normals nor UV indices. */
@@ -339,7 +339,8 @@ void OBJWriter::write_poly_elements(const OBJMesh &obj_mesh_data)
   int16_t last_poly_vertex_group = NEGATIVE_INIT;
   int16_t last_poly_mat_nr = NEGATIVE_INIT;
 
-  const func_vert_uv_normal_indices poly_element_writer = get_poly_element_writer(obj_mesh_data);
+  const func_vert_uv_normal_indices poly_element_writer = get_poly_element_writer(
+      obj_mesh_data.tot_uv_vertices());
 
   /* Number of normals may not be equal to number of polygons due to smooth shading. */
   int per_object_tot_normals = 0;
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 e30ea39638c..b882a28bd0f 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
@@ -62,7 +62,7 @@ class OBJWriter : NonMovable, NonCopyable {
     file_handler_ = std::make_unique<FileHandler<eFileType::OBJ>>(filepath);
   }
 
-  void writer_header() const;
+  void write_header() const;
 
   void write_object_name(const OBJMesh &obj_mesh_data) const;
   void write_object_group(const OBJMesh &obj_mesh_data) const;
@@ -89,7 +89,7 @@ class OBJWriter : NonMovable, NonCopyable {
   using func_vert_uv_normal_indices = void (OBJWriter::*)(Span<int> vert_indices,
                                                           Span<int> uv_indices,
                                                           Span<int> normal_indices) const;
-  func_vert_uv_normal_indices get_poly_element_writer(const OBJMesh &obj_mesh_data) const;
+  func_vert_uv_normal_indices get_poly_element_writer(const int total_uv_vertices) const;
 
   void write_vert_uv_normal_indices(Span<int> vert_indices,
                                     Span<int> uv_indices,
diff --git a/source/blender/io/wavefront_obj/exporter/obj_exporter.cc b/source/blender/io/wavefront_obj/exporter/obj_exporter.cc
index 06a92285f1a..28d9c97d30b 100644
--- a/source/blender/io/wavefront_obj/exporter/obj_exporter.cc
+++ b/source/blender/io/wavefront_obj/exporter/obj_exporter.cc
@@ -228,7 +228,7 @@ static void export_frame(Depsgraph *depsgraph,
     return;
   }
 
-  frame_writer->writer_header();
+  frame_writer->write_header();
 
   auto [exportable_as_mesh, exportable_as_nurbs] = filter_supported_objects(depsgraph,
                                                                             export_params);