diff options
| author | gaiaclary <gaia.clary@machinimatrix.org> | 2014-07-26 19:54:18 +0400 |
|---|---|---|
| committer | gaiaclary <gaia.clary@machinimatrix.org> | 2014-07-26 19:54:18 +0400 |
| commit | a6eeeee4abeabeffcacbb4c69d43f349723bc387 (patch) | |
| tree | 0cbd9c0b60685f0d2fa40709169e5087ca09d47d /source/blender/editors/armature/meshlaplacian.c | |
| parent | e15cdec2d49ee47a85897db9838578a298146513 (diff) | |
Adding Mask select mode to Assign weights from Bone Heat (when called in Weight Paint mode)
Reviewers: campbellbarton
Differential Revision: https://developer.blender.org/D681
Diffstat (limited to 'source/blender/editors/armature/meshlaplacian.c')
| -rw-r--r-- | source/blender/editors/armature/meshlaplacian.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/editors/armature/meshlaplacian.c b/source/blender/editors/armature/meshlaplacian.c index 56e7bde0081..49650fcadbf 100644 --- a/source/blender/editors/armature/meshlaplacian.c +++ b/source/blender/editors/armature/meshlaplacian.c @@ -635,8 +635,8 @@ void heat_bone_weighting(Object *ob, Mesh *me, float (*verts)[3], int numsource, bool use_topology = (me->editflag & ME_EDIT_MIRROR_TOPO) != 0; MVert *mvert = me->mvert; - bool use_vert_sel = false; - bool use_face_sel = false; + bool use_vert_sel = (me->editflag & ME_EDIT_PAINT_VERT_SEL) != 0; + bool use_face_sel = (me->editflag & ME_EDIT_PAINT_FACE_SEL) != 0; *err_str = NULL; @@ -652,9 +652,8 @@ void heat_bone_weighting(Object *ob, Mesh *me, float (*verts)[3], int numsource, return; /* count triangles and create mask */ - 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)))) + if (ob->mode & OB_MODE_WEIGHT_PAINT && + (use_face_sel || use_vert_sel)) { mask = MEM_callocN(sizeof(int) * me->totvert, "heat_bone_weighting mask"); |