[Bf-blender-cvs] [04375869595] refactor-mesh-selection-generic: Fixes, cleanup

[Hans Goudey]

Commit: 04375869595e9276591cbb10179d22945dc01a36
Author: Hans Goudey
Date:   Wed Sep 14 18:48:09 2022 -0500
Branches: refactor-mesh-selection-generic
https://developer.blender.org/rB04375869595e9276591cbb10179d22945dc01a36

Fixes, cleanup

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

M	source/blender/blenkernel/intern/mesh_boolean_convert.cc
M	source/blender/nodes/geometry/nodes/node_geo_extrude_mesh.cc

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

diff --git a/source/blender/blenkernel/intern/mesh_boolean_convert.cc b/source/blender/blenkernel/intern/mesh_boolean_convert.cc
index 6a32159e691..7c89f840d7f 100644
--- a/source/blender/blenkernel/intern/mesh_boolean_convert.cc
+++ b/source/blender/blenkernel/intern/mesh_boolean_convert.cc
@@ -375,8 +375,6 @@ static IMesh meshes_to_imesh(Span<const Mesh *> meshes,
  * `mv` is in `dest_mesh` with index `mv_index`.
  * The `orig_mv` vertex came from Mesh `orig_me` and had index `index_in_orig_me` there. */
 static void copy_vert_attributes(Mesh *dest_mesh,
-                                 MVert *mv,
-                                 const MVert *orig_mv,
                                  const Mesh *orig_me,
                                  int mv_index,
                                  int index_in_orig_me)
@@ -722,14 +720,14 @@ static Mesh *imesh_to_mesh(IMesh *im, MeshesToIMeshInfo &mim)
   MutableSpan<MVert> verts = result->verts_for_write();
   for (int vi : im->vert_index_range()) {
     const Vert *v = im->vert(vi);
-    MVert *mv = &verts[vi];
-    copy_v3fl_v3db(mv->co, v->co);
     if (v->orig != NO_INDEX) {
       const Mesh *orig_me;
       int index_in_orig_me;
-      const MVert *orig_mv = mim.input_mvert_for_orig_index(v->orig, &orig_me, &index_in_orig_me);
-      copy_vert_attributes(result, mv, orig_mv, orig_me, vi, index_in_orig_me);
+      mim.input_mvert_for_orig_index(v->orig, &orig_me, &index_in_orig_me);
+      copy_vert_attributes(result, orig_me, vi, index_in_orig_me);
     }
+    MVert *mv = &verts[vi];
+    copy_v3fl_v3db(mv->co, v->co);
   }
 
   /* Set the loopstart and totloop for each output poly,
diff --git a/source/blender/nodes/geometry/nodes/node_geo_extrude_mesh.cc b/source/blender/nodes/geometry/nodes/node_geo_extrude_mesh.cc
index c7f4b78946d..9d23976aaf6 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_extrude_mesh.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_extrude_mesh.cc
@@ -288,7 +288,6 @@ static void extrude_mesh_vertices(Mesh &mesh,
       for (const int i : range) {
         const float3 offset = offsets[selection[i]];
         add_v3_v3(new_verts[i].co, offset);
-        new_verts[i].flag = 0;
       }
     });
   });
@@ -611,7 +610,6 @@ static void extrude_mesh_edges(Mesh &mesh,
     threading::parallel_for(new_verts.index_range(), 1024, [&](const IndexRange range) {
       for (const int i : range) {
         add_v3_v3(new_verts[i].co, offset);
-        new_verts[i].flag = 0;
       }
     });
   }
@@ -619,7 +617,6 @@ static void extrude_mesh_edges(Mesh &mesh,
     threading::parallel_for(new_verts.index_range(), 1024, [&](const IndexRange range) {
       for (const int i : range) {
         add_v3_v3(new_verts[i].co, vert_offsets[new_vert_indices[i]]);
-        new_verts[i].flag = 0;
       }
     });
   }
@@ -1001,10 +998,6 @@ static void extrude_mesh_face_regions(Mesh &mesh,
         });
   }
 
-  for (MVert &vert : verts.slice(new_vert_range)) {
-    vert.flag = 0;
-  }
-
   MutableSpan<int> vert_orig_indices = get_orig_index_layer(mesh, ATTR_DOMAIN_POINT);
   vert_orig_indices.slice(new_vert_range).fill(ORIGINDEX_NONE);
 
@@ -1262,7 +1255,6 @@ static void extrude_individual_mesh_faces(Mesh &mesh,
       const IndexRange poly_corner_range = selected_corner_range(index_offsets, i_selection);
       for (MVert &vert : new_verts.slice(poly_corner_range)) {
         add_v3_v3(vert.co, poly_offset[poly_selection[i_selection]]);
-        vert.flag = 0;
       }
     }
   });