[Bf-blender-cvs] [d6b35a45a94] soc-2021-adaptive-cloth: adaptive_cloth: BKE_cloth_remesh: convert to and from AdaptiveMesh

[ishbosamiya]

Commit: d6b35a45a94238f83e1678a3cd3c8740b47a0a92
Author: ishbosamiya
Date:   Fri Jul 16 22:14:05 2021 +0530
Branches: soc-2021-adaptive-cloth
https://developer.blender.org/rBd6b35a45a94238f83e1678a3cd3c8740b47a0a92

adaptive_cloth: BKE_cloth_remesh: convert to and from AdaptiveMesh

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

M	source/blender/blenkernel/intern/cloth_remesh.cc

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

diff --git a/source/blender/blenkernel/intern/cloth_remesh.cc b/source/blender/blenkernel/intern/cloth_remesh.cc
index 145adaa08c7..f0248de6b0a 100644
--- a/source/blender/blenkernel/intern/cloth_remesh.cc
+++ b/source/blender/blenkernel/intern/cloth_remesh.cc
@@ -39,6 +39,9 @@ class NodeData;
 class VertData;
 class Sizing;
 
+using AdaptiveMesh =
+    internal::Mesh<NodeData, VertData, internal::EmptyExtraData, internal::EmptyExtraData>;
+
 template<typename T> static inline T simple_interp(const T &a, const T &b)
 {
   return (a + b) * 0.5;
@@ -171,11 +174,14 @@ Mesh *BKE_cloth_remesh(Object *ob, ClothModifierData *clmd, Mesh *mesh)
   auto *cloth_to_object_res = cloth_to_object(ob, clmd, mesh, false);
   BLI_assert(cloth_to_object_res == nullptr);
 
-  internal::MeshIO meshio;
+  internal::MeshIO meshio_input;
+  meshio_input.read(mesh);
 
-  meshio.read(mesh);
+  AdaptiveMesh adaptive_mesh;
+  adaptive_mesh.read(meshio_input);
 
-  return meshio.write();
+  auto meshio_output = adaptive_mesh.write();
+  return meshio_output.write();
 }
 
 }  // namespace blender::bke