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:
authorJason Hays <jason_hays22@mymail.eku.edu>2011-07-20 19:56:35 +0400
committerJason Hays <jason_hays22@mymail.eku.edu>2011-07-20 19:56:35 +0400
commitfb3783bd13c5258e48d3c94abce82e3b9156adac (patch)
tree2447de1064117ac7538317f5cad142e8277e5875 /source/blender/blenkernel/intern/paint.c
parentc6444eaa0f1a3ef7bf50c1e2d0d0b54406f75732 (diff)
Added vertex masking support for the weight paint vgroup functions including:
Normalize, Normalize All, Invert, Clean, and Levels. Face mask and vertex select/mask are now mutually exclusive options. Went ahead and allowed vertex selection support and masking for vertex paint.
Diffstat (limited to 'source/blender/blenkernel/intern/paint.c')
-rw-r--r--source/blender/blenkernel/intern/paint.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c
index 9a0fc541bce..5dc58ba4aa8 100644
--- a/source/blender/blenkernel/intern/paint.c
+++ b/source/blender/blenkernel/intern/paint.c
@@ -99,7 +99,7 @@ int paint_facesel_test(Object *ob)
/* Jason */
int paint_vertsel_test(Object *ob)
{
- return (ob && ob->type==OB_MESH && ob->data && (((Mesh *)ob->data)->editflag & ME_EDIT_VERT_SEL) && (ob->mode & (OB_MODE_WEIGHT_PAINT)));
+ return (ob && ob->type==OB_MESH && ob->data && (((Mesh *)ob->data)->editflag & ME_EDIT_VERT_SEL) && (ob->mode & (OB_MODE_VERTEX_PAINT|OB_MODE_WEIGHT_PAINT)));
}
void paint_init(Paint *p, const char col[3])
{