[Bf-blender-cvs] [0fe2a9c9019] refactor-mesh-position-generic: Merge branch 'master' into refactor-mesh-position-generic

[Hans Goudey]

Commit: 0fe2a9c901933b1ae8f747ee62431aa311e59b89
Author: Hans Goudey
Date:   Fri Dec 9 16:15:08 2022 -0600
Branches: refactor-mesh-position-generic
https://developer.blender.org/rB0fe2a9c901933b1ae8f747ee62431aa311e59b89

Merge branch 'master' into refactor-mesh-position-generic

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



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

diff --cc source/blender/blenkernel/intern/mesh_normals.cc
index 23a026b56db,f32b23476b6..1cc298039bf
--- a/source/blender/blenkernel/intern/mesh_normals.cc
+++ b/source/blender/blenkernel/intern/mesh_normals.cc
@@@ -772,11 -821,11 +773,11 @@@ struct LoopSplitTaskDataCommon 
    MutableSpan<short2> clnors_data;
  
    /* Read-only. */
 -  Span<MVert> verts;
 +  Span<float3> positions;
-   MutableSpan<MEdge> edges;
+   Span<MEdge> edges;
    Span<MLoop> loops;
    Span<MPoly> polys;
-   int (*edge_to_loops)[2];
+   MutableSpan<int2> edge_to_loops;
    Span<int> loop_to_poly;
    Span<float3> polynors;
    Span<float3> vert_normals;
@@@ -1613,10 -1638,10 +1591,10 @@@ void BKE_mesh_normals_loop_split(const 
    common_data.lnors_spacearr = r_lnors_spacearr;
    common_data.loopnors = {reinterpret_cast<float3 *>(r_loopnors), numLoops};
    common_data.clnors_data = {reinterpret_cast<short2 *>(clnors_data), clnors_data ? numLoops : 0};
 -  common_data.verts = {mverts, numVerts};
 +  common_data.positions = {reinterpret_cast<const float3 *>(positions), numVerts};
-   common_data.edges = {const_cast<MEdge *>(medges), numEdges};
-   common_data.polys = {mpolys, numPolys};
-   common_data.loops = {mloops, numLoops};
+   common_data.edges = {medges, numEdges};
+   common_data.polys = polys;
+   common_data.loops = loops;
    common_data.edge_to_loops = edge_to_loops;
    common_data.loop_to_poly = loop_to_poly;
    common_data.polynors = {reinterpret_cast<const float3 *>(polynors), numPolys};
diff --cc source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.cc
index 00087fe6388,dc65ffd60a4..730f7c400a7
--- a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.cc
+++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.cc
@@@ -2042,8 -2043,9 +2042,9 @@@ static void lineart_geometry_object_loa
  
    TriData tri_data;
    tri_data.ob_info = ob_info;
 +  tri_data.positions = me->positions();
    tri_data.mlooptri = mlooptri;
 -  tri_data.verts = me->verts();
+   tri_data.loops = me->loops();
    tri_data.material_indices = material_indices;
    tri_data.vert_arr = la_v_arr;
    tri_data.tri_arr = la_tri_arr;
diff --cc source/blender/nodes/geometry/nodes/node_geo_extrude_mesh.cc
index 658b87c1305,d390a33245d..3f39dd4a47c
--- a/source/blender/nodes/geometry/nodes/node_geo_extrude_mesh.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_extrude_mesh.cc
@@@ -1255,9 -1268,9 +1275,9 @@@ static void extrude_individual_mesh_fac
    /* Offset the new vertices. */
    threading::parallel_for(poly_selection.index_range(), 1024, [&](const IndexRange range) {
      for (const int i_selection : range) {
-       const IndexRange poly_corner_range = selected_corner_range(index_offsets, i_selection);
-       for (float3 &position : new_positions.slice(poly_corner_range)) {
+       const IndexRange extrude_range = selected_corner_range(index_offsets, i_selection);
 -      for (MVert &vert : new_verts.slice(extrude_range)) {
 -        add_v3_v3(vert.co, poly_offset[poly_selection[i_selection]]);
++      for (float3 &position : new_positions.slice(extrude_range)) {
 +        position += poly_offset[poly_selection[i_selection]];
        }
      }
    });