blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

BMesh: face-join, remove redundant face assignment 

Keep ifdef'd out for holes, this isn't needed currently.
This commit is contained in:
Campbell Barton 2016-11-10 03:19:44 +11:00
parent 4d9562a3ae
commit 47759b14ab
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/bmesh/intern/bmesh_core.c
View File

@ -1317,22 +1317,15 @@ BMFace *BM_faces_join(BMesh *bm, BMFace **faces, int totface, const bool do_del)
#ifdef USE_BMESH_HOLES
/* add holes */
BLI_movelisttolist(&f_new->loops, &holes);
#endif
/* update loop face pointer */
#ifdef USE_BMESH_HOLES
for (lst = f_new->loops.first; lst; lst = lst->next)
#endif
{
#ifdef USE_BMESH_HOLES
for (lst = f_new->loops.first; lst; lst = lst->next) {
l_iter = l_first = lst->first;
#else
l_iter = l_first = BM_FACE_FIRST_LOOP(f_new);
#endif
do {
l_iter->f = f_new;
} while ((l_iter = l_iter->next) != l_first);
}
#endif
bm_elements_systag_disable(faces, totface, _FLAG_JF);
BM_ELEM_API_FLAG_DISABLE(f_new, _FLAG_JF);