[Bf-blender-cvs] [79f70b1b09e] soc-2021-adaptive-cloth: adaptive_cloth: AdaptiveMesh: no need to add flag after split edge

ishbosamiya noreply at git.blender.org
Mon Sep 6 11:47:38 CEST 2021


Commit: 79f70b1b09e55eeb5b80ba846c0c07166d7e89d7
Author: ishbosamiya
Date:   Mon Aug 30 18:08:16 2021 +0530
Branches: soc-2021-adaptive-cloth
https://developer.blender.org/rB79f70b1b09e55eeb5b80ba846c0c07166d7e89d7

adaptive_cloth: AdaptiveMesh: no need to add flag after split edge

Since split edge triangulate already handles copying the extra data,
there is no need to try to add the flag `EDGE_BETWEEN_SEWING_EDGES` to
the newly split edges.

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

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 c41f86a428e..bfc94a6ef77 100644
--- a/source/blender/blenkernel/intern/cloth_remesh.cc
+++ b/source/blender/blenkernel/intern/cloth_remesh.cc
@@ -754,29 +754,6 @@ class AdaptiveMesh : public Mesh<NodeData<END>, VertData, EdgeData, internal::Em
     const auto added_verts = mesh_diff.get_added_verts();
 
     if (sewing_enabled) {
-      /* Edges that were split and had `EDGE_BETWEEN_SEWING_EDGES`,
-       * the new edges formed from the edge split should also have
-       * `EDGE_BETWEEN_SEWING_EDGES` */
-      {
-        blender::Vector<VertIndex> verts_with_edge_between_sewing_edges;
-        for (const auto &deleted_edge : mesh_diff.get_deleted_edges()) {
-          const auto &edge_verts = deleted_edge.get_checked_verts();
-          verts_with_edge_between_sewing_edges.append_non_duplicates(std::get<0>(edge_verts));
-          verts_with_edge_between_sewing_edges.append_non_duplicates(std::get<1>(edge_verts));
-        }
-
-        for (const auto &added_edge_index : mesh_diff.get_added_edges()) {
-          auto &added_edge = this->get_checked_edge(added_edge_index);
-          for (const auto &vert_with_edge_between_sewing_edges :
-               verts_with_edge_between_sewing_edges) {
-            if (added_edge.has_vert(vert_with_edge_between_sewing_edges)) {
-              auto &added_edge_flags = added_edge.get_checked_extra_data_mut().get_flags_mut();
-              added_edge_flags |= EDGE_BETWEEN_SEWING_EDGES;
-            }
-          }
-        }
-      }
-
       BLI_assert(mesh_diff.get_added_nodes().size() == 1);
       std::cout << "mesh_diff.get_added_verts().size(): " << mesh_diff.get_added_verts().size()
                 << std::endl;



More information about the Bf-blender-cvs mailing list