[Bf-blender-cvs] [a10942814aa] soc-2020-io-performance: Rename OBJMeshToBmesh to OBJRawToBmesh

Ankit Meel noreply at git.blender.org
Sun Jul 12 15:41:04 CEST 2020


Commit: a10942814aa5618b914acf41ae996413e2fa549a
Author: Ankit Meel
Date:   Sat Jul 11 22:25:01 2020 +0530
Branches: soc-2020-io-performance
https://developer.blender.org/rBa10942814aa5618b914acf41ae996413e2fa549a

Rename OBJMeshToBmesh to OBJRawToBmesh

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

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

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

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 e19ab12862b..8fdcb1a0d8f 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_importer.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_importer.cc
@@ -134,7 +134,7 @@ void OBJImporter::print_obj_data(Vector<std::unique_ptr<OBJRawObject>> &list_of_
   }
 }
 
-OBJMeshToBmesh::OBJMeshToBmesh(OBJRawObject &curr_object)
+OBJRawToBmesh::OBJRawToBmesh(OBJRawObject &curr_object)
 {
   template_mesh_ = std::unique_ptr<Mesh>(
       BKE_mesh_new_nomain(0, 0, 0, curr_object.tot_loop, curr_object.face_elements.size()));
@@ -149,7 +149,7 @@ OBJMeshToBmesh::OBJMeshToBmesh(OBJRawObject &curr_object)
   BM_mesh_bm_from_me(bm_new_.get(), template_mesh_.get(), &bm_convert_params);
 };
 
-OBJMeshToBmesh::~OBJMeshToBmesh()
+OBJRawToBmesh::~OBJRawToBmesh()
 {
   if (bm_new_.get()) {
     BM_mesh_free(bm_new_.release());
@@ -162,7 +162,7 @@ OBJMeshToBmesh::~OBJMeshToBmesh()
 static std::unique_ptr<Mesh> mesh_from_raw_obj(Main *bmain, OBJRawObject &curr_object)
 {
 
-  OBJMeshToBmesh P{curr_object};
+  OBJRawToBmesh P{curr_object};
   /* Vertex creation. */
   Array<BMVert *> all_vertices(curr_object.vertices.size());
   for (int i = 0; i < curr_object.vertices.size(); i++) {
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_importer.hh b/source/blender/io/wavefront_obj/intern/wavefront_obj_importer.hh
index 77fd1e403b4..90ce0714549 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_importer.hh
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_importer.hh
@@ -72,10 +72,10 @@ class OBJParentCollection {
   Collection *parent_collection_;
 };
 
-class OBJMeshToBmesh : NonMovable, NonCopyable {
+class OBJRawToBmesh : NonMovable, NonCopyable {
  public:
-  OBJMeshToBmesh(OBJRawObject &curr_object);
-  ~OBJMeshToBmesh();
+  OBJRawToBmesh(OBJRawObject &curr_object);
+  ~OBJRawToBmesh();
   BMesh *getter_bmesh()
   {
     return bm_new_.get();



More information about the Bf-blender-cvs mailing list