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

[Hans Goudey]

Commit: 54e26a391e6061b9c8c1fe2dfb99439981cf7ad8
Author: Hans Goudey
Date:   Fri Dec 30 23:54:19 2022 -0500
Branches: refactor-mesh-position-generic
https://developer.blender.org/rB54e26a391e6061b9c8c1fe2dfb99439981cf7ad8

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

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



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

diff --cc source/blender/blenkernel/intern/mesh_convert.cc
index e38d336e85f,0a66bacd004..30425dbce10
--- a/source/blender/blenkernel/intern/mesh_convert.cc
+++ b/source/blender/blenkernel/intern/mesh_convert.cc
@@@ -209,13 -209,13 +209,13 @@@ static Mesh *mesh_nurbs_displist_to_mes
      const bool is_smooth = (dl->rt & CU_SMOOTH) != 0;
  
      if (dl->type == DL_SEGM) {
-       startvert = vertcount;
+       const int startvert = dst_vert;
        a = dl->parts * dl->nr;
-       data = dl->verts;
+       const float *data = dl->verts;
        while (a--) {
-         copy_v3_v3(positions[vertcount], data);
 -        copy_v3_v3(verts[dst_vert].co, data);
++        copy_v3_v3(positions[dst_vert], data);
          data += 3;
-         vertcount++;
+         dst_vert++;
        }
  
        for (a = 0; a < dl->parts; a++) {
@@@ -231,13 -231,13 +231,13 @@@
      }
      else if (dl->type == DL_POLY) {
        if (conv_polys) {
-         startvert = vertcount;
+         const int startvert = dst_vert;
          a = dl->parts * dl->nr;
-         data = dl->verts;
+         const float *data = dl->verts;
          while (a--) {
-           copy_v3_v3(positions[vertcount], data);
 -          copy_v3_v3(verts[dst_vert].co, data);
++          copy_v3_v3(positions[dst_vert], data);
            data += 3;
-           vertcount++;
+           dst_vert++;
          }
  
          for (a = 0; a < dl->parts; a++) {
@@@ -257,13 -257,13 +257,13 @@@
        }
      }
      else if (dl->type == DL_INDEX3) {
-       startvert = vertcount;
+       const int startvert = dst_vert;
        a = dl->nr;
-       data = dl->verts;
+       const float *data = dl->verts;
        while (a--) {
-         copy_v3_v3(positions[vertcount], data);
 -        copy_v3_v3(verts[dst_vert].co, data);
++        copy_v3_v3(positions[dst_vert], data);
          data += 3;
-         vertcount++;
+         dst_vert++;
        }
  
        a = dl->parts;
@@@ -292,13 -292,13 +292,13 @@@
        }
      }
      else if (dl->type == DL_SURF) {
-       startvert = vertcount;
+       const int startvert = dst_vert;
        a = dl->parts * dl->nr;
-       data = dl->verts;
+       const float *data = dl->verts;
        while (a--) {
-         copy_v3_v3(positions[vertcount], data);
 -        copy_v3_v3(verts[dst_vert].co, data);
++        copy_v3_v3(positions[dst_vert], data);
          data += 3;
-         vertcount++;
+         dst_vert++;
        }
  
        for (a = 0; a < dl->parts; a++) {