diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-13 08:14:35 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-13 08:14:35 +0400 |
| commit | 2d1a05874b46d31ee3598ec786a77b45512d99e1 (patch) | |
| tree | f0c453f231b52b5898911f77365d908145da8460 /source/blender/editors/armature/meshlaplacian.c | |
| parent | 7be1cd733dfe064d1976b706610c39f97e536b90 (diff) | |
| parent | 399ad54204ad9c3bc9dbd15ec4840824d224dc0c (diff) | |
svn merge ^/trunk/blender -r44024:44076
Diffstat (limited to 'source/blender/editors/armature/meshlaplacian.c')
| -rw-r--r-- | source/blender/editors/armature/meshlaplacian.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/armature/meshlaplacian.c b/source/blender/editors/armature/meshlaplacian.c index 5c378da33df..8881202a1d7 100644 --- a/source/blender/editors/armature/meshlaplacian.c +++ b/source/blender/editors/armature/meshlaplacian.c @@ -682,8 +682,8 @@ void heat_bone_weighting(Object *ob, Mesh *me, float (*verts)[3], int numsource, mask[mface->v4]= (mvert[mface->v4].flag & SELECT) != 0; } } - else { - if(use_face_sel) { + else if (use_face_sel) { + if (mface->flag & ME_FACE_SEL) { mask[mface->v1]= 1; mask[mface->v2]= 1; mask[mface->v3]= 1; |