[Bf-blender-cvs] [0c3763f580e] refactor-mesh-uv-map-generic: Merge branch 'master' into refactor-mesh-uv-map-generic

[Martijn Versteegh]

Commit: 0c3763f580eee4e5c4b0cde85cd6974a130f9a1a
Author: Martijn Versteegh
Date:   Sat Dec 31 13:10:06 2022 +0100
Branches: refactor-mesh-uv-map-generic
https://developer.blender.org/rB0c3763f580eee4e5c4b0cde85cd6974a130f9a1a

Merge branch 'master' into refactor-mesh-uv-map-generic

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



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

diff --cc source/blender/blenkernel/intern/mesh_convert.cc
index 622d5f2ae18,0a66bacd004..7d5f8afb715
--- a/source/blender/blenkernel/intern/mesh_convert.cc
+++ b/source/blender/blenkernel/intern/mesh_convert.cc
@@@ -196,16 -198,13 +198,13 @@@ static Mesh *mesh_nurbs_displist_to_mes
    MutableAttributeAccessor attributes = mesh->attributes_for_write();
    SpanAttributeWriter<int> material_indices = attributes.lookup_or_add_for_write_only_span<int>(
        "material_index", ATTR_DOMAIN_FACE);
 -  MLoopUV *mloopuv = static_cast<MLoopUV *>(CustomData_add_layer_named(
 -      &mesh->ldata, CD_MLOOPUV, CD_SET_DEFAULT, nullptr, mesh->totloop, DATA_("UVMap")));
 +  blender::float2 *mloopuv = static_cast<blender::float2 *>(CustomData_add_layer_named(
 +      &mesh->ldata, CD_PROP_FLOAT2, CD_SET_DEFAULT, nullptr, mesh->totloop, DATA_("UVMap")));
  
-   /* verts and faces */
-   vertcount = 0;
- 
+   int dst_vert = 0;
+   int dst_edge = 0;
+   int dst_poly = 0;
+   int dst_loop = 0;
    LISTBASE_FOREACH (const DispList *, dl, dispbase) {
      const bool is_smooth = (dl->rt & CU_SMOOTH) != 0;
  
@@@ -282,8 -278,8 +278,8 @@@
  
          if (mloopuv) {
            for (int i = 0; i < 3; i++, mloopuv++) {
-             (*mloopuv)[0] = (mloop[i].v - startvert) / float(dl->nr - 1);
 -            mloopuv->uv[0] = (loops[dst_loop + i].v - startvert) / float(dl->nr - 1);
 -            mloopuv->uv[1] = 0.0f;
++            (*mloopuv)[0] = (loops[dst_loop + i].v - startvert) / float(dl->nr - 1);
 +            (*mloopuv)[1] = 0.0f;
            }
          }
  
@@@ -357,17 -353,17 +353,17 @@@
  
              for (int i = 0; i < 4; i++, mloopuv++) {
                /* find uv based on vertex index into grid array */
-               int v = mloop[i].v - startvert;
+               int v = loops[dst_loop + i].v - startvert;
  
 -              mloopuv->uv[0] = (v / dl->nr) / float(orco_sizev);
 -              mloopuv->uv[1] = (v % dl->nr) / float(orco_sizeu);
 +              (*mloopuv)[0] = (v / dl->nr) / float(orco_sizev);
 +              (*mloopuv)[1] = (v % dl->nr) / float(orco_sizeu);
  
                /* cyclic correction */
 -              if (ELEM(i, 1, 2) && mloopuv->uv[0] == 0.0f) {
 -                mloopuv->uv[0] = 1.0f;
 +              if ((ELEM(i, 1, 2)) && (*mloopuv)[0] == 0.0f) {
 +                (*mloopuv)[0] = 1.0f;
                }
 -              if (ELEM(i, 0, 1) && mloopuv->uv[1] == 0.0f) {
 -                mloopuv->uv[1] = 1.0f;
 +              if ((ELEM(i, 0, 1)) && (*mloopuv)[1] == 0.0f) {
 +                (*mloopuv)[1] = 1.0f;
                }
              }
            }
diff --cc source/blender/editors/sculpt_paint/paint_image_proj.cc
index 9f41d4f58c0,3d23cb46856..7bcce664267
--- a/source/blender/editors/sculpt_paint/paint_image_proj.cc
+++ b/source/blender/editors/sculpt_paint/paint_image_proj.cc
@@@ -4103,11 -4104,11 +4103,11 @@@ static bool proj_paint_state_mesh_eval_
    return true;
  }
  
- typedef struct {
+ struct ProjPaintLayerClone {
 -  const MLoopUV *mloopuv_clone_base;
 +  const float (*mloopuv_clone_base)[2];
    const TexPaintSlot *slot_last_clone;
    const TexPaintSlot *slot_clone;
- } ProjPaintLayerClone;
+ };
  
  static void proj_paint_layer_clone_init(ProjPaintState *ps, ProjPaintLayerClone *layer_clone)
  {