From b66cd0e4c44feab77f4ccf09cea0b5eee6df1a6b Mon Sep 17 00:00:00 2001 From: bonj Date: Thu, 16 Mar 2023 17:36:53 +0100 Subject: [PATCH 1/2] Use endVert instead of edge->v2 To make it consistent with the surrounding code. --- source/blender/blenkernel/intern/mesh_convert.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/blender/blenkernel/intern/mesh_convert.cc b/source/blender/blenkernel/intern/mesh_convert.cc index 9cb0c766d29..96730b3d4d4 100644 --- a/source/blender/blenkernel/intern/mesh_convert.cc +++ b/source/blender/blenkernel/intern/mesh_convert.cc @@ -531,7 +531,7 @@ void BKE_mesh_to_curve_nurblist(const Mesh *me, ListBase *nurblist, const int ed if (edge->v1 == endVert) { endVert = edge->v2; - appendPolyLineVert(&polyline, edge->v2); + appendPolyLineVert(&polyline, endVert); totpoly++; BLI_freelinkN(&edges, edl); totedges--; -- 2.30.2 From 74b80e87d5bbcd589b37006ff1d416dbe8e0df3e Mon Sep 17 00:00:00 2001 From: bonj Date: Thu, 16 Mar 2023 17:38:10 +0100 Subject: [PATCH 2/2] Remove totedges This variable isn't actually used, probably a remnant from long ago. --- source/blender/blenkernel/intern/mesh_convert.cc | 8 -------- 1 file changed, 8 deletions(-) diff --git a/source/blender/blenkernel/intern/mesh_convert.cc b/source/blender/blenkernel/intern/mesh_convert.cc index 96730b3d4d4..0ce80e54342 100644 --- a/source/blender/blenkernel/intern/mesh_convert.cc +++ b/source/blender/blenkernel/intern/mesh_convert.cc @@ -472,8 +472,6 @@ void BKE_mesh_to_curve_nurblist(const Mesh *me, ListBase *nurblist, const int ed const Span polys = me->polys(); const Span loops = me->loops(); - int totedges = 0; - /* only to detect edge polylines */ int *edge_users; @@ -497,7 +495,6 @@ void BKE_mesh_to_curve_nurblist(const Mesh *me, ListBase *nurblist, const int ed edl->edge = &mesh_edges[i]; BLI_addtail(&edges, edl); - totedges++; } } MEM_freeN(edge_users); @@ -519,7 +516,6 @@ void BKE_mesh_to_curve_nurblist(const Mesh *me, ListBase *nurblist, const int ed appendPolyLineVert(&polyline, endVert); totpoly++; BLI_freelinkN(&edges, edges.last); - totedges--; while (ok) { /* while connected edges are found... */ EdgeLink *edl = (EdgeLink *)edges.last; @@ -534,7 +530,6 @@ void BKE_mesh_to_curve_nurblist(const Mesh *me, ListBase *nurblist, const int ed appendPolyLineVert(&polyline, endVert); totpoly++; BLI_freelinkN(&edges, edl); - totedges--; ok = true; } else if (edge->v2 == endVert) { @@ -542,7 +537,6 @@ void BKE_mesh_to_curve_nurblist(const Mesh *me, ListBase *nurblist, const int ed appendPolyLineVert(&polyline, endVert); totpoly++; BLI_freelinkN(&edges, edl); - totedges--; ok = true; } else if (edge->v1 == startVert) { @@ -550,7 +544,6 @@ void BKE_mesh_to_curve_nurblist(const Mesh *me, ListBase *nurblist, const int ed prependPolyLineVert(&polyline, startVert); totpoly++; BLI_freelinkN(&edges, edl); - totedges--; ok = true; } else if (edge->v2 == startVert) { @@ -558,7 +551,6 @@ void BKE_mesh_to_curve_nurblist(const Mesh *me, ListBase *nurblist, const int ed prependPolyLineVert(&polyline, startVert); totpoly++; BLI_freelinkN(&edges, edl); - totedges--; ok = true; } -- 2.30.2