[Bf-blender-cvs] [a7f5998550b] soc-2020-io-performance: Refactor: move functions out of Importer class

[Ankit Meel]

Commit: a7f5998550b632293f3779ffefcc35e66108dd74
Author: Ankit Meel
Date:   Tue Jul 21 14:11:48 2020 +0530
Branches: soc-2020-io-performance
https://developer.blender.org/rBa7f5998550b632293f3779ffefcc35e66108dd74

Refactor: move functions out of Importer class

No functional change

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

M	source/blender/io/wavefront_obj/intern/wavefront_obj_im_file_reader.hh
M	source/blender/io/wavefront_obj/intern/wavefront_obj_importer.cc

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

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 f3fe3a9e092..0c1abc35d22 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
@@ -39,12 +39,6 @@ class OBJImporter {
 
   void parse_and_store(Vector<std::unique_ptr<OBJRawObject>> &list_of_objects,
                        GlobalVertices &global_vertices);
-  void print_obj_data(Vector<std::unique_ptr<OBJRawObject>> &list_of_objects,
-                      const GlobalVertices &global_vertices);
-  void raw_to_blender_objects(Main *bmain,
-                              Scene *scene,
-                              Vector<std::unique_ptr<OBJRawObject>> &list_of_objects,
-                              const GlobalVertices global_vertices);
 };
 
 }  // namespace blender::io::obj
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_importer.cc b/source/blender/io/wavefront_obj/intern/wavefront_obj_importer.cc
index 78aaa3add14..2424ffdc349 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_importer.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_importer.cc
@@ -39,8 +39,8 @@
 
 namespace blender::io::obj {
 
-void OBJImporter::print_obj_data(Vector<std::unique_ptr<OBJRawObject>> &list_of_objects,
-                                 const GlobalVertices &global_vertices)
+static void print_obj_data(Vector<std::unique_ptr<OBJRawObject>> &list_of_objects,
+                           const GlobalVertices &global_vertices)
 {
   for (auto &curr_vert : global_vertices.vertices) {
     print_v3("vert", curr_vert);
@@ -92,8 +92,10 @@ void importer_main(bContext *C, const OBJImportParams &import_params)
   Vector<std::unique_ptr<OBJRawObject>> list_of_objects;
   OBJImporter importer{import_params};
   GlobalVertices global_vertices;
+
   importer.parse_and_store(list_of_objects, global_vertices);
-  importer.print_obj_data(list_of_objects, global_vertices);
-  importer.raw_to_blender_objects(bmain, scene, list_of_objects, global_vertices);
+
+  print_obj_data(list_of_objects, global_vertices);
+  raw_to_blender_objects(bmain, scene, list_of_objects, global_vertices);
 }
 }  // namespace blender::io::obj