[Bf-blender-cvs] [d17b21604dc] soc-2021-adaptive-cloth: adaptive_cloth: ClothNodeData: fix typo for ClothVertex flags interp

ishbosamiya noreply at git.blender.org
Mon Aug 30 09:15:05 CEST 2021


Commit: d17b21604dce915dc07ec09f234b1f5b5b96a287
Author: ishbosamiya
Date:   Thu Aug 26 10:06:00 2021 +0530
Branches: soc-2021-adaptive-cloth
https://developer.blender.org/rBd17b21604dce915dc07ec09f234b1f5b5b96a287

adaptive_cloth: ClothNodeData: fix typo for ClothVertex flags interp

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

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 ec4009f1e37..9c63dbd27f4 100644
--- a/source/blender/blenkernel/intern/cloth_remesh.cc
+++ b/source/blender/blenkernel/intern/cloth_remesh.cc
@@ -138,8 +138,8 @@ class ClothNodeData {
     ClothVertex cn;
     /* 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);
+    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);



More information about the Bf-blender-cvs mailing list