blender
/
blender
132
398
Fork 577
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Dyntopo: minor speedups with bmesh use.

This commit is contained in:
Campbell Barton 2014-04-07 13:48:36 +10:00
parent 212717416b
commit 2527d0ce8f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/blenkernel/intern/pbvh_bmesh.c
View File

@ -314,8 +314,9 @@ static BMFace *pbvh_bmesh_face_create(PBVH *bvh, int node_index,
f = BM_face_create(bvh->bm, v_tri, e_tri, 3, f_example, BM_CREATE_NOP);
if (!BLI_ghash_haskey(bvh->bm_face_to_node, f)) {
BLI_assert(!BLI_ghash_haskey(bvh->bm_face_to_node, f));
{
BLI_ghash_insert(bvh->nodes[node_index].bm_faces, f, NULL);
BLI_ghash_insert(bvh->bm_face_to_node, f, val);
@ -852,7 +853,7 @@ static void pbvh_bmesh_collapse_edge(PBVH *bvh, BMEdge *e, BMVert *v1,
}
/* Kill the edge */
BLI_assert(BM_edge_face_count(e) == 0);
BLI_assert(BM_edge_is_wire(e));
BM_edge_kill(bvh->bm, e);
/* For all remaining faces of v_del, create a new face that is the
@ -936,7 +937,7 @@ static void pbvh_bmesh_collapse_edge(PBVH *bvh, BMEdge *e, BMVert *v1,
/* Check if any of the face's edges are now unused by any
* face, if so delete them */
for (j = 0; j < 3; j++) {
if (BM_edge_face_count(e_tri[j]) == 0)
if (BM_edge_is_wire(e_tri[j]))
BM_edge_kill(bvh->bm, e_tri[j]);
}