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

code cleanup: replace BM_DISK_EDGE_LINK_GET define with inline function, that checks for the vertex not matching either of the edges verts.

Browse Source
This commit is contained in:
Campbell Barton
2012-09-12 05:11:38 +00:00
parent bd5fdf63cb
commit 77e351300b
2 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/bmesh/intern/bmesh_private.h
View File

@@ -53,12 +53,6 @@ int bmesh_elem_check(void *element, const char htype);
} (void)0
#endif
#define BM_DISK_EDGE_LINK_GET(e, v) ( \
((v) == ((BMEdge *)(e))->v1) ? \
&((e)->v1_disk_link) : \
&((e)->v2_disk_link) \
)
int bmesh_radial_length(BMLoop *l);
int bmesh_disk_count(BMVert *v);

26
source/blender/bmesh/intern/bmesh_structure.c
View File

@@ -153,10 +153,22 @@ int bmesh_edge_swapverts(BMEdge *e, BMVert *orig, BMVert *newv)
* advantage is that no intrinsic properties of the data structures are dependent upon the
* cycle order and all non-manifold conditions are represented trivially.
*/
BLI_INLINE BMDiskLink *bmesh_disk_edge_link_from_vert(BMEdge *e, BMVert *v)
{
if (v == e->v1) {
return &e->v1_disk_link;
}
else {
BLI_assert(v == e->v2);
return &e->v2_disk_link;
}
}
int bmesh_disk_edge_append(BMEdge *e, BMVert *v)
{
if (!v->e) {
BMDiskLink *dl1 = BM_DISK_EDGE_LINK_GET(e, v);
BMDiskLink *dl1 = bmesh_disk_edge_link_from_vert(e, v);
v->e = e;
dl1->next = dl1->prev = e;
@@ -164,9 +176,9 @@ int bmesh_disk_edge_append(BMEdge *e, BMVert *v)
else {
BMDiskLink *dl1, *dl2, *dl3;
dl1 = BM_DISK_EDGE_LINK_GET(e, v);
dl2 = BM_DISK_EDGE_LINK_GET(v->e, v);
dl3 = dl2->prev ? BM_DISK_EDGE_LINK_GET(dl2->prev, v) : NULL;
dl1 = bmesh_disk_edge_link_from_vert(e, v);
dl2 = bmesh_disk_edge_link_from_vert(v->e, v);
dl3 = dl2->prev ? bmesh_disk_edge_link_from_vert(dl2->prev, v) : NULL;
dl1->next = v->e;
dl1->prev = dl2->prev;
@@ -183,14 +195,14 @@ void bmesh_disk_edge_remove(BMEdge *e, BMVert *v)
{
BMDiskLink *dl1, *dl2;
dl1 = BM_DISK_EDGE_LINK_GET(e, v);
dl1 = bmesh_disk_edge_link_from_vert(e, v);
if (dl1->prev) {
dl2 = BM_DISK_EDGE_LINK_GET(dl1->prev, v);
dl2 = bmesh_disk_edge_link_from_vert(dl1->prev, v);
dl2->next = dl1->next;
}
if (dl1->next) {
dl2 = BM_DISK_EDGE_LINK_GET(dl1->next, v);
dl2 = bmesh_disk_edge_link_from_vert(dl1->next, v);
dl2->prev = dl1->prev;
}