diff options
author | Campbell Barton <ideasman42@gmail.com> | 2016-11-09 19:19:44 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2016-11-09 19:21:42 +0300 |
commit | 47759b14abdeb4aa825a5a207cdbb594d7e717ea (patch) | |
tree | 0c544840b81034efad997594401caa15463ad3a3 /source/blender | |
parent | 4d9562a3ae34e038b178043446c8e82f2dbd1dbd (diff) |
BMesh: face-join, remove redundant face assignment
Keep ifdef'd out for holes, this isn't needed currently.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/bmesh/intern/bmesh_core.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/source/blender/bmesh/intern/bmesh_core.c b/source/blender/bmesh/intern/bmesh_core.c index 93ff6f84620..a7e1aa7fb07 100644 --- a/source/blender/bmesh/intern/bmesh_core.c +++ b/source/blender/bmesh/intern/bmesh_core.c @@ -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); |