griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.4-release'

Browse Source
This commit is contained in:
Philipp Oeser
2025-02-10 10:27:57 +01:00
parent a57225f4d8 351aef120f
commit 8f45746fb9
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/editors/object/object_vgroup.cc
View File

@@ -2067,8 +2067,7 @@ void vgroup_mirror(Object *ob,
int *r_totmirr,
int *r_totfail)
{
/* TODO: vgroup locking.
* TODO: face masking. */
/* TODO: vgroup locking. */
const int def_nr = BKE_object_defgroup_active_index_get(ob) - 1;
int totmirr = 0, totfail = 0;
@@ -2157,8 +2156,8 @@ void vgroup_mirror(Object *ob,
}
else {
/* object mode / weight paint */
const bool use_vert_sel = (mesh->editflag & ME_EDIT_PAINT_VERT_SEL) != 0;
const bool use_sel = (mesh->editflag & (ME_EDIT_PAINT_FACE_SEL | ME_EDIT_PAINT_VERT_SEL)) !=
0;
if (mesh->deform_verts().is_empty()) {
goto cleanup;
}
@@ -2175,8 +2174,8 @@ void vgroup_mirror(Object *ob,
if ((vidx_mirr = mesh_get_x_mirror_vert(ob, nullptr, vidx, use_topology)) != -1) {
if (vidx != vidx_mirr) {
if (!BLI_BITMAP_TEST(vert_tag, vidx_mirr)) {
const bool sel = use_vert_sel ? select_vert[vidx] : true;
const bool sel_mirr = use_vert_sel ? select_vert[vidx_mirr] : true;
const bool sel = use_sel ? select_vert[vidx] : true;
const bool sel_mirr = use_sel ? select_vert[vidx_mirr] : true;
if (sel || sel_mirr) {
dvert_mirror_op(&dverts[vidx],