[Bf-blender-cvs] [a8134647c9a] master: Fix T61360: Weight paint tools ignore face select

[Campbell Barton]

Commit: a8134647c9a99252b123c16f3eeb8b3cef62e646
Author: Campbell Barton
Date:   Thu Feb 14 11:47:23 2019 +1100
Branches: master
https://developer.blender.org/rBa8134647c9a99252b123c16f3eeb8b3cef62e646

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.

===================================================================

M	source/blender/editors/object/object_vgroup.c

===================================================================

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 {