diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-01-23 20:47:20 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-01-23 20:47:20 +0400 |
| commit | 08475490097cf7445423ddc57b8de9eac5f5470c (patch) | |
| tree | ac67eaad1fde86f39508a299899983f2521c010b /source/blender/editors/armature/meshlaplacian.c | |
| parent | c37e8ecc50a36b0e956d0da0ba1de7d6ea803509 (diff) | |
Fix T37685: automatic weights affected by face masking outside weight paint mode.
Only when in weight paint mode should it check the selected vertices and faces,
in object mode it should just affect the entire mesh.
Diffstat (limited to 'source/blender/editors/armature/meshlaplacian.c')
| -rw-r--r-- | source/blender/editors/armature/meshlaplacian.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/armature/meshlaplacian.c b/source/blender/editors/armature/meshlaplacian.c index 3b285e12331..017d2783c1d 100644 --- a/source/blender/editors/armature/meshlaplacian.c +++ b/source/blender/editors/armature/meshlaplacian.c @@ -668,8 +668,9 @@ void heat_bone_weighting(Object *ob, Mesh *me, float (*verts)[3], int numsource, return; /* count triangles and create mask */ - if ((use_face_sel = ((me->editflag & ME_EDIT_PAINT_FACE_SEL) != 0)) || - (use_vert_sel = ((me->editflag & ME_EDIT_PAINT_VERT_SEL) != 0))) + if (ob->mode == OB_MODE_WEIGHT_PAINT && + ((use_face_sel = ((me->editflag & ME_EDIT_PAINT_FACE_SEL) != 0)) || + (use_vert_sel = ((me->editflag & ME_EDIT_PAINT_VERT_SEL) != 0)))) { mask = MEM_callocN(sizeof(int) * me->totvert, "heat_bone_weighting mask"); |