[Bf-blender-cvs] [76bdacec1bf] refactor-mesh-hide-generic: Cleanup variables names, add "finish" calls

[Hans Goudey]

Commit: 76bdacec1bf299de6b36dbc6e45d7922ca15d969
Author: Hans Goudey
Date:   Thu Jul 21 18:19:46 2022 -0500
Branches: refactor-mesh-hide-generic
https://developer.blender.org/rB76bdacec1bf299de6b36dbc6e45d7922ca15d969

Cleanup variables names, add "finish" calls

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

M	source/blender/blenkernel/intern/mesh_evaluate.cc
M	source/blender/blenkernel/intern/mesh_legacy_convert.cc
M	source/blender/editors/mesh/editface.cc

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

diff --git a/source/blender/blenkernel/intern/mesh_evaluate.cc b/source/blender/blenkernel/intern/mesh_evaluate.cc
index 65fdd3235c4..315c3ef51ab 100644
--- a/source/blender/blenkernel/intern/mesh_evaluate.cc
+++ b/source/blender/blenkernel/intern/mesh_evaluate.cc
@@ -752,12 +752,12 @@ void BKE_mesh_flush_hidden_from_verts(Mesh *me)
   const Span<MPoly> polys(me->mpoly, me->totpoly);
   const Span<MLoop> loops(me->mloop, me->totloop);
 
-  /* Hide edges when both of their vertices are hidden. */
+  /* Hide edges when either of their vertices are hidden. */
   SpanAttributeWriter<bool> hide_edge = attributes.lookup_or_add_for_write_only_span<bool>(
       ".hide_edge", ATTR_DOMAIN_EDGE);
   for (const int i : edges.index_range()) {
     const MEdge &edge = edges[i];
-    hide_edge.span[i] = hide_vert_span[edge.v1] && hide_vert_span[edge.v2];
+    hide_edge.span[i] = hide_vert_span[edge.v1] || hide_vert_span[edge.v2];
   }
   hide_edge.finish();
 
diff --git a/source/blender/blenkernel/intern/mesh_legacy_convert.cc b/source/blender/blenkernel/intern/mesh_legacy_convert.cc
index f67bb81f3d0..56f548884c1 100644
--- a/source/blender/blenkernel/intern/mesh_legacy_convert.cc
+++ b/source/blender/blenkernel/intern/mesh_legacy_convert.cc
@@ -886,11 +886,11 @@ void BKE_mesh_legacy_convert_hide_layers_to_flags(Mesh *mesh)
   using namespace blender::bke;
   const AttributeAccessor attributes = mesh_attributes(*mesh);
 
-  MutableSpan<MVert> verts(mesh->mvert, mesh->totvert);
+  MutableSpan<MVert> vertices(mesh->mvert, mesh->totvert);
   const VArray<bool> hide_vert = attributes.lookup_or_default<bool>(
       ".hide_vert", ATTR_DOMAIN_POINT, false);
-  for (const int i : verts.index_range()) {
-    SET_FLAG_FROM_TEST(verts[i].flag, hide_vert[i], ME_HIDE);
+  for (const int i : vertices.index_range()) {
+    SET_FLAG_FROM_TEST(vertices[i].flag, hide_vert[i], ME_HIDE);
   }
 
   MutableSpan<MEdge> edges(mesh->medge, mesh->totedge);
@@ -900,11 +900,11 @@ void BKE_mesh_legacy_convert_hide_layers_to_flags(Mesh *mesh)
     SET_FLAG_FROM_TEST(edges[i].flag, hide_edge[i], ME_HIDE);
   }
 
-  MutableSpan<MPoly> polys(mesh->mpoly, mesh->totpoly);
+  MutableSpan<MPoly> polygons(mesh->mpoly, mesh->totpoly);
   const VArray<bool> hide_face = attributes.lookup_or_default<bool>(
       ".hide_face", ATTR_DOMAIN_FACE, false);
-  for (const int i : polys.index_range()) {
-    SET_FLAG_FROM_TEST(polys[i].flag, hide_face[i], ME_HIDE);
+  for (const int i : polygons.index_range()) {
+    SET_FLAG_FROM_TEST(polygons[i].flag, hide_face[i], ME_HIDE);
   }
 }
 
@@ -914,14 +914,16 @@ void BKE_mesh_legacy_convert_flags_to_hide_layers(Mesh *mesh)
   using namespace blender::bke;
   MutableAttributeAccessor attributes = mesh_attributes_for_write(*mesh);
 
-  const Span<MVert> verts(mesh->mvert, mesh->totvert);
-  if (std::any_of(
-          verts.begin(), verts.end(), [](const MVert &vert) { return vert.flag & ME_HIDE; })) {
+  const Span<MVert> vertices(mesh->mvert, mesh->totvert);
+  if (std::any_of(vertices.begin(), vertices.end(), [](const MVert &vert) {
+        return vert.flag & ME_HIDE;
+      })) {
     SpanAttributeWriter<bool> hide_vert = attributes.lookup_or_add_for_write_only_span<bool>(
         ".hide_vert", ATTR_DOMAIN_POINT);
-    for (const int i : verts.index_range()) {
-      hide_vert.span[i] = verts[i].flag & ME_HIDE;
+    for (const int i : vertices.index_range()) {
+      hide_vert.span[i] = vertices[i].flag & ME_HIDE;
     }
+    hide_vert.finish();
   }
 
   const Span<MEdge> edges(mesh->medge, mesh->totedge);
@@ -932,16 +934,19 @@ void BKE_mesh_legacy_convert_flags_to_hide_layers(Mesh *mesh)
     for (const int i : edges.index_range()) {
       hide_edge.span[i] = edges[i].flag & ME_HIDE;
     }
+    hide_edge.finish();
   }
 
-  const Span<MPoly> polys(mesh->mpoly, mesh->totpoly);
-  if (std::any_of(
-          polys.begin(), polys.end(), [](const MPoly &poly) { return poly.flag & ME_HIDE; })) {
+  const Span<MPoly> polygons(mesh->mpoly, mesh->totpoly);
+  if (std::any_of(polygons.begin(), polygons.end(), [](const MPoly &poly) {
+        return poly.flag & ME_HIDE;
+      })) {
     SpanAttributeWriter<bool> hide_face = attributes.lookup_or_add_for_write_only_span<bool>(
         ".hide_face", ATTR_DOMAIN_FACE);
-    for (const int i : polys.index_range()) {
-      hide_face.span[i] = polys[i].flag & ME_HIDE;
+    for (const int i : polygons.index_range()) {
+      hide_face.span[i] = polygons[i].flag & ME_HIDE;
     }
+    hide_face.finish();
   }
 }
 
diff --git a/source/blender/editors/mesh/editface.cc b/source/blender/editors/mesh/editface.cc
index 35aa729d7a5..88d2fce2933 100644
--- a/source/blender/editors/mesh/editface.cc
+++ b/source/blender/editors/mesh/editface.cc
@@ -647,6 +647,7 @@ void paintvert_hide(bContext *C, Object *ob, const bool unselected)
       vert.flag &= ~SELECT;
     }
   }
+  hide_vert.finish();
 
   BKE_mesh_flush_hidden_from_verts(me);