From 36b6ea6cb10751dca752bbef7a87dfbf0aba4de8 Mon Sep 17 00:00:00 2001 From: Alexander Gavrilov Date: Mon, 21 Dec 2020 19:42:23 +0300 Subject: [PATCH] Weight Paint: fix Multi-Paint weight display after rB5502517c3. Weight Paint Multi-Paint definitely depends on the weight specific flag, and vertex group locking also involves group name symmetry via BKE_object_defgroup_mirror_selection. These two are also features implemented by me so I feel confident. The rest of object_vgroup.c possibly should be changed too, but that requires more consideration than these obvious cases. --- source/blender/draw/intern/draw_cache_impl_mesh.c | 2 +- source/blender/editors/object/object_vgroup.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.c b/source/blender/draw/intern/draw_cache_impl_mesh.c index 8e23199430a..239df55db1a 100644 --- a/source/blender/draw/intern/draw_cache_impl_mesh.c +++ b/source/blender/draw/intern/draw_cache_impl_mesh.c @@ -397,7 +397,7 @@ static void drw_mesh_weight_state_extract(Object *ob, wstate->flags |= DRW_MESH_WEIGHT_STATE_MULTIPAINT | (ts->auto_normalize ? DRW_MESH_WEIGHT_STATE_AUTO_NORMALIZE : 0); - if (me->symmetry & ME_SYMMETRY_X) { + if (me->editflag & ME_EDIT_VERTEX_GROUPS_X_SYMMETRY) { BKE_object_defgroup_mirror_selection(ob, wstate->defgroup_len, wstate->defgroup_sel, diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index fc4969019b5..c3eee17dc6d 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -1751,7 +1751,7 @@ static bool *vgroup_selected_get(Object *ob) /* Mirror the selection if X Mirror is enabled. */ Mesh *me = BKE_mesh_from_object(ob); - if (me && (me->symmetry & ME_SYMMETRY_X) != 0) { + if (me && (me->editflag & ME_EDIT_VERTEX_GROUPS_X_SYMMETRY) != 0) { BKE_object_defgroup_mirror_selection(ob, defbase_tot, mask, mask, &sel_count); } }