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

Fix weight-mirror reporting invalid failed mirror verts

Browse Source 
Use vertex tagging instead of clearing mirror index.
This commit is contained in:
Campbell Barton
2016-05-10 00:52:06 +10:00
parent f616caa315
commit 299a25cb35
1 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/editors/object/object_vgroup.c
View File

@@ -2197,10 +2197,14 @@ void ED_vgroup_mirror(Object *ob,
EDBM_verts_mirror_cache_begin(em, 0, true, false, use_topology); EDBM_verts_mirror_cache_begin(em, 0, true, false, use_topology);
BM_mesh_elem_hflag_disable_all(em->bm, BM_VERT, BM_ELEM_TAG, false);
/* Go through the list of editverts and assign them */ /* Go through the list of editverts and assign them */
BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) { BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) {
if (!BM_elem_flag_test(eve, BM_ELEM_TAG)) {
if ((eve_mirr = EDBM_verts_mirror_get(em, eve))) { if ((eve_mirr = EDBM_verts_mirror_get(em, eve))) {
if (eve_mirr != eve) { if (eve_mirr != eve) {
if (!BM_elem_flag_test(eve_mirr, BM_ELEM_TAG)) {
sel = BM_elem_flag_test(eve, BM_ELEM_SELECT); sel = BM_elem_flag_test(eve, BM_ELEM_SELECT);
sel_mirr = BM_elem_flag_test(eve_mirr, BM_ELEM_SELECT); sel_mirr = BM_elem_flag_test(eve_mirr, BM_ELEM_SELECT);
@@ -2211,16 +2215,18 @@ void ED_vgroup_mirror(Object *ob,
VGROUP_MIRR_OP; VGROUP_MIRR_OP;
totmirr++; totmirr++;
} }
}
/* don't use these again */ /* don't use these again */
EDBM_verts_mirror_cache_clear(em, eve); BM_elem_flag_enable(eve, BM_ELEM_TAG);
EDBM_verts_mirror_cache_clear(em, eve_mirr); BM_elem_flag_enable(eve_mirr, BM_ELEM_TAG);
}
}
} }
else { else {
totfail++; totfail++;
} }
} }
}
EDBM_verts_mirror_cache_end(em); EDBM_verts_mirror_cache_end(em);
} }
else { else {