[Bf-blender-cvs] [9cb750ba66e] soc-2020-io-performance: Cleanup: Remove unused functions and headers.

Ankit Meel noreply at git.blender.org
Tue Jul 21 23:35:20 CEST 2020


Commit: 9cb750ba66eeb8a1d8cd1aa841670b209f59e841
Author: Ankit Meel
Date:   Wed Jul 22 01:52:21 2020 +0530
Branches: soc-2020-io-performance
https://developer.blender.org/rB9cb750ba66eeb8a1d8cd1aa841670b209f59e841

Cleanup: Remove unused functions and headers.

Explicitly specify empty string.

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

M	source/blender/io/wavefront_obj/intern/wavefront_obj_im_mesh.cc
M	source/blender/io/wavefront_obj/intern/wavefront_obj_im_mesh.hh
M	source/blender/io/wavefront_obj/intern/wavefront_obj_im_objects.hh

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

diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_im_mesh.cc b/source/blender/io/wavefront_obj/intern/wavefront_obj_im_mesh.cc
index 6150efdf149..fab4677c103 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_im_mesh.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_im_mesh.cc
@@ -29,8 +29,6 @@
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 
-#include "ED_mesh.h"
-
 #include "wavefront_obj_im_mesh.hh"
 #include "wavefront_obj_im_objects.hh"
 
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_im_mesh.hh b/source/blender/io/wavefront_obj/intern/wavefront_obj_im_mesh.hh
index 52db31d9d36..f75037eeed3 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_im_mesh.hh
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_im_mesh.hh
@@ -43,20 +43,12 @@ struct UniqueMeshDeleter {
   }
 };
 
-struct UniqueBMeshDeleter {
-  void operator()(BMesh *t)
-  {
-    BM_mesh_free(t);
-  }
-};
-
 using unique_mesh_ptr = std::unique_ptr<Mesh, UniqueMeshDeleter>;
-using unique_bmesh_ptr = std::unique_ptr<BMesh, UniqueBMeshDeleter>;
 
 class OBJMeshFromRaw : NonMovable, NonCopyable {
  private:
   unique_mesh_ptr mesh_from_ob_;
-
+  
  public:
   OBJMeshFromRaw(const OBJRawObject &curr_object, const GlobalVertices global_vertices);
 
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_im_objects.hh b/source/blender/io/wavefront_obj/intern/wavefront_obj_im_objects.hh
index 26473e38b20..7c328a56c37 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_im_objects.hh
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_im_objects.hh
@@ -56,7 +56,7 @@ class OBJRawObject {
  public:
   OBJRawObject(StringRef ob_name) : object_name(ob_name.data()){};
 
-  std::string object_name;
+  std::string object_name{};
   Vector<int> vertex_indices{};
   Vector<int> uv_vertex_indices{};
   /**



More information about the Bf-blender-cvs mailing list