[Bf-blender-cvs] [21a097f9522] soc-2020-io-performance: Revert renaming mesh_utils to utils.

[Ankit Meel]

Commit: 21a097f9522553d2895a4a302ae87fcc80833864
Author: Ankit Meel
Date:   Thu Sep 3 14:30:22 2020 +0530
Branches: soc-2020-io-performance
https://developer.blender.org/rB21a097f9522553d2895a4a302ae87fcc80833864

Revert renaming mesh_utils to utils.

No functional change.

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

M	source/blender/io/wavefront_obj/CMakeLists.txt
R099	source/blender/io/wavefront_obj/intern/utils.cc	source/blender/io/wavefront_obj/intern/mesh_utils.cc
R100	source/blender/io/wavefront_obj/intern/utils.hh	source/blender/io/wavefront_obj/intern/mesh_utils.hh
M	source/blender/io/wavefront_obj/intern/obj_import_mesh.cc
M	source/blender/io/wavefront_obj/intern/obj_import_nurbs.cc

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

diff --git a/source/blender/io/wavefront_obj/CMakeLists.txt b/source/blender/io/wavefront_obj/CMakeLists.txt
index 90b1c4ee47a..568d14332dd 100644
--- a/source/blender/io/wavefront_obj/CMakeLists.txt
+++ b/source/blender/io/wavefront_obj/CMakeLists.txt
@@ -38,8 +38,7 @@ set(INC_SYS
 )
 
 set(SRC
-  intern/utils.cc
-  intern/wavefront_obj.cc
+  intern/mesh_utils.cc
   intern/obj_exporter.cc
   intern/obj_export_mesh.cc
   intern/obj_export_mtl.cc
@@ -51,9 +50,10 @@ set(SRC
   intern/obj_import_mtl.cc
   intern/obj_import_nurbs.cc
   intern/obj_import_objects.cc
+  intern/wavefront_obj.cc
 
   IO_wavefront_obj.h
-  intern/utils.hh
+  intern/mesh_utils.hh
   intern/obj_exporter.hh
   intern/obj_export_mesh.hh
   intern/obj_export_mtl.hh
diff --git a/source/blender/io/wavefront_obj/intern/utils.cc b/source/blender/io/wavefront_obj/intern/mesh_utils.cc
similarity index 99%
rename from source/blender/io/wavefront_obj/intern/utils.cc
rename to source/blender/io/wavefront_obj/intern/mesh_utils.cc
index 9412bb67ef2..98888d4914d 100644
--- a/source/blender/io/wavefront_obj/intern/utils.cc
+++ b/source/blender/io/wavefront_obj/intern/mesh_utils.cc
@@ -23,7 +23,7 @@
 
 #include <array>
 
-#include "utils.hh"
+#include "mesh_utils.hh"
 
 #include "BKE_displist.h"
 #include "BKE_mesh.h"
diff --git a/source/blender/io/wavefront_obj/intern/utils.hh b/source/blender/io/wavefront_obj/intern/mesh_utils.hh
similarity index 100%
rename from source/blender/io/wavefront_obj/intern/utils.hh
rename to source/blender/io/wavefront_obj/intern/mesh_utils.hh
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 bc47eed00d7..4877afb34c3 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 "utils.hh"
+#include "mesh_utils.hh"
 #include "obj_import_mesh.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 c941c6e75d3..a02b5460133 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 "utils.hh"
+#include "mesh_utils.hh"
 #include "obj_import_nurbs.hh"
 #include "obj_import_objects.hh"