[Bf-blender-cvs] [ad5b8bd899d] soc-2020-io-performance: Cleanup: function & variable renaming; comments.

[Ankit Meel]

Commit: ad5b8bd899d5583806c9639613b0b03e25dcc6d7
Author: Ankit Meel
Date:   Sat Jun 13 20:22:46 2020 +0530
Branches: soc-2020-io-performance
https://developer.blender.org/rBad5b8bd899d5583806c9639613b0b03e25dcc6d7

Cleanup: function & variable renaming; comments.

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

M	source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.cc
M	source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.cc
M	source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.hh

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

diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.cc b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.cc
index e861687e0d6..56d7a060135 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.cc
@@ -48,13 +48,15 @@
 namespace io {
 namespace obj {
 
-static void object_is_exportable(Object *object,
-                                 std::vector<OBJ_object_to_export> &object_to_export)
+/**
+ * Check object type to filter only exportable types.
+ */
+static void check_object_type(Object *object, std::vector<OBJ_object_to_export> &objects_to_export)
 {
   switch (object->type) {
     case OB_MESH:
-      object_to_export.push_back(OBJ_object_to_export());
-      object_to_export.back().object = object;
+      objects_to_export.push_back(OBJ_object_to_export());
+      objects_to_export.back().object = object;
       break;
       /* Do nothing for all other cases for now. */
     default:
@@ -206,7 +208,7 @@ void exporter_main(bContext *C, const OBJExportParams *export_params)
   Base *base = static_cast<Base *>(view_layer->object_bases.first);
   for (; base; base = base->next) {
     Object *object_in_layer = base->object;
-    object_is_exportable(object_in_layer, exportable_objects);
+    check_object_type(object_in_layer, exportable_objects);
   }
 
   for (uint i = 0; i < exportable_objects.size(); i++) {
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.cc b/source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.cc
index d53457b86b9..8e9ddc0163a 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.cc
@@ -105,7 +105,7 @@ static void write_geomtery_per_object(FILE *outfile,
  * Low level writer to the OBJ file at filepath.
  */
 void write_object_fprintf(const char *filepath,
-                          std::vector<OBJ_object_to_export> &object_to_export)
+                          std::vector<OBJ_object_to_export> &objects_to_export)
 {
   FILE *outfile = fopen(filepath, "w");
   if (outfile == NULL) {
@@ -120,11 +120,11 @@ void write_object_fprintf(const char *filepath,
   uint index_offset[3] = {0, 0, 0};
 
   fprintf(outfile, "# Blender 2.90\n");
-  for (uint i = 0; i < object_to_export.size(); i++) {
-    write_geomtery_per_object(outfile, object_to_export[i], index_offset);
-    index_offset[0] += object_to_export[i].tot_vertices;
-    index_offset[1] += object_to_export[i].tot_uv_vertices;
-    index_offset[2] += object_to_export[i].tot_poly;
+  for (uint i = 0; i < objects_to_export.size(); i++) {
+    write_geomtery_per_object(outfile, objects_to_export[i], index_offset);
+    index_offset[0] += objects_to_export[i].tot_vertices;
+    index_offset[1] += objects_to_export[i].tot_uv_vertices;
+    index_offset[2] += objects_to_export[i].tot_poly;
   }
   fclose(outfile);
 }
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.hh b/source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.hh
index e2e5c34df9b..d6cdf4e8298 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.hh
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.hh
@@ -30,7 +30,6 @@ namespace obj {
 
 /**
  * Low level writer to the OBJ file at filepath.
- * object_to_export is filled in obj_exporter.cc.
  */
 void write_object_fprintf(const char *filepath,
                           std::vector<OBJ_object_to_export> &object_to_export);