Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-02-14 03:47:23 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-02-14 03:47:23 +0300
commita8134647c9a99252b123c16f3eeb8b3cef62e646 (patch)
treeb56c7a014f3382c39cbcb296df919f5918a78300 /source/blender/editors/object/object_vgroup.c
parent6c2a0049e4f37ede5dae6ae771dfeb2bf8050ee4 (diff)
Fix T61360: Weight paint tools ignore face select
Face selection was added in weight paint mode since 2.7x, however tools hadn't been updated.
Diffstat (limited to 'source/blender/editors/object/object_vgroup.c')
-rw-r--r--source/blender/editors/object/object_vgroup.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c
index e1c18106e0f..e3bfd025e48 100644
--- a/source/blender/editors/object/object_vgroup.c
+++ b/source/blender/editors/object/object_vgroup.c
@@ -80,7 +80,9 @@ static bool vertex_group_use_vert_sel(Object *ob)
if (ob->mode == OB_MODE_EDIT) {
return true;
}
- else if (ob->type == OB_MESH && ((Mesh *)ob->data)->editflag & ME_EDIT_PAINT_VERT_SEL) {
+ else if ((ob->type == OB_MESH) &&
+ ((Mesh *)ob->data)->editflag & (ME_EDIT_PAINT_VERT_SEL | ME_EDIT_PAINT_FACE_SEL))
+ {
return true;
}
else {