[Bf-blender-cvs] [cb9424b99c0] soc-2021-adaptive-cloth: modifier: adaptive_remesh: collapse edge only if collapseable

[ishbosamiya]

Commit: cb9424b99c0cd6802ea19e331580292833eb5777
Author: ishbosamiya
Date:   Wed Aug 4 12:29:19 2021 +0530
Branches: soc-2021-adaptive-cloth
https://developer.blender.org/rBcb9424b99c0cd6802ea19e331580292833eb5777

modifier: adaptive_remesh: collapse edge only if collapseable

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

M	source/blender/modifiers/intern/MOD_adaptive_remesh.cc

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

diff --git a/source/blender/modifiers/intern/MOD_adaptive_remesh.cc b/source/blender/modifiers/intern/MOD_adaptive_remesh.cc
index 707dd43f09a..f9b1c09e1bd 100644
--- a/source/blender/modifiers/intern/MOD_adaptive_remesh.cc
+++ b/source/blender/modifiers/intern/MOD_adaptive_remesh.cc
@@ -113,17 +113,20 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *UNUSED(ctx)
       internal::dump_file(post_split_filename, post_split_msgpack);
     }
     else if (mode == ADAPTIVE_REMESH_COLLAPSE_EDGE) {
-      auto pre_collapse_msgpack = internal_mesh.serialize();
-      auto pre_collapse_filename = collapse_edge_name_gen.get_curr(filename_pre_suffix + "_pre");
+      if (collapseable) {
+        auto pre_collapse_msgpack = internal_mesh.serialize();
+        auto pre_collapse_filename = collapse_edge_name_gen.get_curr(filename_pre_suffix + "_pre");
 
-      internal_mesh.collapse_edge_triangulate(edge_index, verts_swapped, across_seams);
+        internal_mesh.collapse_edge_triangulate(edge_index, verts_swapped, across_seams);
 
-      auto post_collapse_msgpack = internal_mesh.serialize();
-      auto post_collapse_filename = collapse_edge_name_gen.get_curr(filename_pre_suffix + "_post");
-      /* collapse_edge_name_gen.gen_next(); */
+        auto post_collapse_msgpack = internal_mesh.serialize();
+        auto post_collapse_filename = collapse_edge_name_gen.get_curr(filename_pre_suffix +
+                                                                      "_post");
+        /* collapse_edge_name_gen.gen_next(); */
 
-      internal::dump_file(pre_collapse_filename, pre_collapse_msgpack);
-      internal::dump_file(post_collapse_filename, post_collapse_msgpack);
+        internal::dump_file(pre_collapse_filename, pre_collapse_msgpack);
+        internal::dump_file(post_collapse_filename, post_collapse_msgpack);
+      }
     }
     else if (mode == ADAPTIVE_REMESH_FLIP_EDGE) {
       if (flippable) {