Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

EditMesh Render: remove edges-of-vert loop

Browse Source 
Replace topology check which checked edges twice
with a loop on the edge array.
This commit is contained in:
Campbell Barton
2017-04-12 15:42:41 +10:00
parent dc1499ba1c
commit 9e94479359
1 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
source/blender/blenkernel/intern/mesh_render.c
View File

@@ -181,31 +181,30 @@ static MeshRenderData *mesh_render_data_create(Mesh *me, const int types)
int *lverts = mrdata->loose_verts = MEM_mallocN(mrdata->totvert * sizeof(int), "Loose Vert"); int *lverts = mrdata->loose_verts = MEM_mallocN(mrdata->totvert * sizeof(int), "Loose Vert");
int *ledges = mrdata->loose_edges = MEM_mallocN(mrdata->totedge * sizeof(int), "Loose Edges"); int *ledges = mrdata->loose_edges = MEM_mallocN(mrdata->totedge * sizeof(int), "Loose Edges");
for (int i = 0; i < mrdata->totvert; ++i) { {
BMVert *bv = BM_vert_at_index(bm, i); BLI_assert((bm->elem_table_dirty & BM_VERT) == 0);
BMVert **vtable = bm->vtable;
for (int i = 0; i < bm->totvert; i++) {
const BMVert *v = vtable[i];
/* Loose vert */ /* Loose vert */
if (bv->e == NULL) { if (v->e == NULL) {
lverts[mrdata->totlvert] = BM_elem_index_get(bv); lverts[mrdata->totlvert++] = i;
mrdata->totlvert++; }
continue; }
} }
/* Find Loose Edges */ {
BMEdge *e_iter, *e_first; BLI_assert((bm->elem_table_dirty & BM_EDGE) == 0);
e_first = e_iter = bv->e; BMEdge **etable = bm->etable;
do { for (int i = 0; i < bm->totedge; i++) {
if (e_iter->l == NULL) { const BMEdge *e = etable[i];
BMVert *other_vert = BM_edge_other_vert(e_iter, bv); /* Loose edge */
if (e->l == NULL) {
ledges[mrdata->totledge++] = i;
}
}
}
/* Verify we do not add the same edge twice */
if (BM_elem_index_get(other_vert) > i) {
ledges[mrdata->totledge] = BM_elem_index_get(e_iter);
mrdata->totledge++;
}
}
} while ((e_iter = BM_DISK_EDGE_NEXT(e_iter, bv)) != e_first);
}
mrdata->loose_verts = MEM_reallocN(mrdata->loose_verts, mrdata->totlvert * sizeof(int)); mrdata->loose_verts = MEM_reallocN(mrdata->loose_verts, mrdata->totlvert * sizeof(int));
mrdata->loose_edges = MEM_reallocN(mrdata->loose_edges, mrdata->totledge * sizeof(int)); mrdata->loose_edges = MEM_reallocN(mrdata->loose_edges, mrdata->totledge * sizeof(int));
} }