[Bf-blender-cvs] [8ce2fdee8bd] soc-2020-io-performance: Prepend importer_ to mesh_utils; parser_ to string_utils.

[Ankit Meel]

Commit: 8ce2fdee8bde8d09680758b20606fcd74ae92ccf
Author: Ankit Meel
Date:   Wed Sep 16 16:20:29 2020 +0530
Branches: soc-2020-io-performance
https://developer.blender.org/rB8ce2fdee8bde8d09680758b20606fcd74ae92ccf

Prepend importer_ to mesh_utils; parser_ to string_utils.

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

M	source/blender/io/wavefront_obj/CMakeLists.txt
R098	source/blender/io/wavefront_obj/intern/mesh_utils.cc	source/blender/io/wavefront_obj/intern/importer_mesh_utils.cc
R100	source/blender/io/wavefront_obj/intern/mesh_utils.hh	source/blender/io/wavefront_obj/intern/importer_mesh_utils.hh
M	source/blender/io/wavefront_obj/intern/obj_import_file_reader.cc
M	source/blender/io/wavefront_obj/intern/obj_import_mesh.cc
M	source/blender/io/wavefront_obj/intern/obj_import_mtl.cc
M	source/blender/io/wavefront_obj/intern/obj_import_nurbs.cc
R099	source/blender/io/wavefront_obj/intern/string_utils.cc	source/blender/io/wavefront_obj/intern/parser_string_utils.cc
R100	source/blender/io/wavefront_obj/intern/string_utils.hh	source/blender/io/wavefront_obj/intern/parser_string_utils.hh

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

diff --git a/source/blender/io/wavefront_obj/CMakeLists.txt b/source/blender/io/wavefront_obj/CMakeLists.txt
index 8ee17ce9114..184098a226c 100644
--- a/source/blender/io/wavefront_obj/CMakeLists.txt
+++ b/source/blender/io/wavefront_obj/CMakeLists.txt
@@ -38,7 +38,7 @@ set(INC_SYS
 )
 
 set(SRC
-  intern/mesh_utils.cc
+  intern/importer_mesh_utils.cc
   intern/obj_exporter.cc
   intern/obj_export_mesh.cc
   intern/obj_export_mtl.cc
@@ -50,11 +50,11 @@ set(SRC
   intern/obj_import_mtl.cc
   intern/obj_import_nurbs.cc
   intern/obj_import_objects.cc
-  intern/string_utils.cc
+  intern/parser_string_utils.cc
   intern/wavefront_obj.cc
 
   IO_wavefront_obj.h
-  intern/mesh_utils.hh
+  intern/importer_mesh_utils.hh
   intern/obj_exporter.hh
   intern/obj_export_mesh.hh
   intern/obj_export_mtl.hh
@@ -65,7 +65,7 @@ set(SRC
   intern/obj_import_mesh.hh
   intern/obj_import_mtl.hh
   intern/obj_import_nurbs.hh
-  intern/string_utils.hh
+  intern/parser_string_utils.hh
   intern/obj_import_objects.hh
 )
 
diff --git a/source/blender/io/wavefront_obj/intern/mesh_utils.cc b/source/blender/io/wavefront_obj/intern/importer_mesh_utils.cc
similarity index 98%
rename from source/blender/io/wavefront_obj/intern/mesh_utils.cc
rename to source/blender/io/wavefront_obj/intern/importer_mesh_utils.cc
index 1a2c2dc8ba2..261a8e9de80 100644
--- a/source/blender/io/wavefront_obj/intern/mesh_utils.cc
+++ b/source/blender/io/wavefront_obj/intern/importer_mesh_utils.cc
@@ -23,8 +23,6 @@
 
 #include <array>
 
-#include "mesh_utils.hh"
-
 #include "BKE_displist.h"
 #include "BKE_mesh.h"
 
@@ -34,6 +32,8 @@
 
 #include "IO_wavefront_obj.h"
 
+#include "importer_mesh_utils.hh"
+
 namespace blender::io::obj {
 
 static float manhatten_len(const float3 coord)
@@ -326,6 +326,9 @@ Vector<Vector<int>> ngon_tessellate(Span<float3> vertex_coords, Span<int> face_v
 
 /**
  * Apply axes transform to the Object, and clamp object dimensions to the specified value.
+ *
+ * Ideally, this should be a member of a base class which `MeshFromGeometry` and
+ * `CurveFromGeometry` derive from.
  */
 void transform_object(Object *object, const OBJImportParams &import_params)
 {
diff --git a/source/blender/io/wavefront_obj/intern/mesh_utils.hh b/source/blender/io/wavefront_obj/intern/importer_mesh_utils.hh
similarity index 100%
rename from source/blender/io/wavefront_obj/intern/mesh_utils.hh
rename to source/blender/io/wavefront_obj/intern/importer_mesh_utils.hh
diff --git a/source/blender/io/wavefront_obj/intern/obj_import_file_reader.cc b/source/blender/io/wavefront_obj/intern/obj_import_file_reader.cc
index a4d73d94ec2..f3911c724cd 100644
--- a/source/blender/io/wavefront_obj/intern/obj_import_file_reader.cc
+++ b/source/blender/io/wavefront_obj/intern/obj_import_file_reader.cc
@@ -30,7 +30,7 @@
 
 #include "obj_export_file_writer.hh"
 #include "obj_import_file_reader.hh"
-#include "string_utils.hh"
+#include "parser_string_utils.hh"
 
 namespace blender::io::obj {
 
diff --git a/source/blender/io/wavefront_obj/intern/obj_import_mesh.cc b/source/blender/io/wavefront_obj/intern/obj_import_mesh.cc
index 893517f5b0e..055dbfc4955 100644
--- a/source/blender/io/wavefront_obj/intern/obj_import_mesh.cc
+++ b/source/blender/io/wavefront_obj/intern/obj_import_mesh.cc
@@ -45,7 +45,7 @@
 #include "DNA_meshdata_types.h"
 #include "DNA_modifier_types.h"
 
-#include "mesh_utils.hh"
+#include "importer_mesh_utils.hh"
 #include "obj_import_mesh.hh"
 
 namespace blender::io::obj {
diff --git a/source/blender/io/wavefront_obj/intern/obj_import_mtl.cc b/source/blender/io/wavefront_obj/intern/obj_import_mtl.cc
index 59dba3ce736..562226e56b8 100644
--- a/source/blender/io/wavefront_obj/intern/obj_import_mtl.cc
+++ b/source/blender/io/wavefront_obj/intern/obj_import_mtl.cc
@@ -31,7 +31,7 @@
 #include "NOD_shader.h"
 
 #include "obj_import_mtl.hh"
-#include "string_utils.hh"
+#include "parser_string_utils.hh"
 
 namespace blender::io::obj {
 
diff --git a/source/blender/io/wavefront_obj/intern/obj_import_nurbs.cc b/source/blender/io/wavefront_obj/intern/obj_import_nurbs.cc
index 904c2636732..20c6eb4e00f 100644
--- a/source/blender/io/wavefront_obj/intern/obj_import_nurbs.cc
+++ b/source/blender/io/wavefront_obj/intern/obj_import_nurbs.cc
@@ -25,7 +25,7 @@
 
 #include "DNA_curve_types.h"
 
-#include "mesh_utils.hh"
+#include "importer_mesh_utils.hh"
 #include "obj_import_nurbs.hh"
 #include "obj_import_objects.hh"
 
diff --git a/source/blender/io/wavefront_obj/intern/string_utils.cc b/source/blender/io/wavefront_obj/intern/parser_string_utils.cc
similarity index 99%
rename from source/blender/io/wavefront_obj/intern/string_utils.cc
rename to source/blender/io/wavefront_obj/intern/parser_string_utils.cc
index f141e3ca1f6..3ada52e6dde 100644
--- a/source/blender/io/wavefront_obj/intern/string_utils.cc
+++ b/source/blender/io/wavefront_obj/intern/parser_string_utils.cc
@@ -26,7 +26,7 @@
 #include "BLI_string_ref.hh"
 #include "BLI_vector.hh"
 
-#include "string_utils.hh"
+#include "parser_string_utils.hh"
 
 namespace blender::io::obj {
 using std::string;
diff --git a/source/blender/io/wavefront_obj/intern/string_utils.hh b/source/blender/io/wavefront_obj/intern/parser_string_utils.hh
similarity index 100%
rename from source/blender/io/wavefront_obj/intern/string_utils.hh
rename to source/blender/io/wavefront_obj/intern/parser_string_utils.hh