adaptive_cloth: ClothNodeData: interp flags correctly

1 files changed, 4 insertions, 2 deletions

diff --git a/source/blender/blenkernel/intern/cloth_remesh.cc b/source/blender/blenkernel/intern/cloth_remesh.cc
index e76b51629e3..d1aeec382a8 100644
--- a/source/blender/blenkernel/intern/cloth_remesh.cc
+++ b/source/blender/blenkernel/intern/cloth_remesh.cc
@@ -136,8 +136,10 @@ class ClothNodeData {
     }
 
     ClothVertex cn;
-    /* TODO(ish): figure out how to handle the flags */
-    /* cn.flags; */
+    /* CLOTH_VERT_FLAG_PINNED should not be propagated so that the
+     * artist has the choice of pinning only verts that they want */
+    cn.flags |= (this->cloth_node_data.flags | other.cloth_node_data.flags) &
+                (CLOTH_VERT_FLAG_NOSELFCOLL | CLOTH_VERT_FLAG_NOOBJCOLL);
     interp_v3_v3v3(cn.v, this->cloth_node_data.v, other.cloth_node_data.v, 0.5);
     interp_v3_v3v3(cn.xconst, this->cloth_node_data.xconst, other.cloth_node_data.xconst, 0.5);
     interp_v3_v3v3(cn.x, this->cloth_node_data.x, other.cloth_node_data.x, 0.5);