diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-09-14 12:45:12 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-14 12:45:12 +0400 |
commit | a31869f267d7a393555383e1b49dd61c7133651e (patch) | |
tree | dfa38318b4785e4ed80a5d907b5d83e628917094 /source/blender/editors/armature/meshlaplacian.c | |
parent | df433c7a1dd351831ca299e7aecfb7877a19b2f7 (diff) |
some picky rna/variable renaming:
Mesh.wp_vert_sel --> use_paint_mask_vertex
Diffstat (limited to 'source/blender/editors/armature/meshlaplacian.c')
-rw-r--r-- | source/blender/editors/armature/meshlaplacian.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/editors/armature/meshlaplacian.c b/source/blender/editors/armature/meshlaplacian.c index 127b2f4e663..4ce4a780d09 100644 --- a/source/blender/editors/armature/meshlaplacian.c +++ b/source/blender/editors/armature/meshlaplacian.c @@ -659,24 +659,24 @@ void heat_bone_weighting(Object *ob, Mesh *me, float (*verts)[3], int numsource, // Jason MVert *mv = me->mvert; - int selectedVerts; + int use_vert_sel= FALSE; *err_str= NULL; /* count triangles and create mask */ - if((me->editflag & ME_EDIT_PAINT_MASK) || (selectedVerts=(me->editflag & ME_EDIT_VERT_SEL))) + if((me->editflag & ME_EDIT_PAINT_MASK) || (use_vert_sel= ((me->editflag & ME_EDIT_VERT_SEL) != 0))) mask= MEM_callocN(sizeof(int)*me->totvert, "heat_bone_weighting mask"); for(totface=0, a=0, mface=me->mface; a<me->totface; a++, mface++) { totface++; if(mface->v4) totface++; // Jason (added selectedVerts content for vertex mask, they used to just equal 1) - if(mask && ((mface->flag & ME_FACE_SEL) || selectedVerts)) { - mask[mface->v1]= selectedVerts ? ((mv+mface->v1)->flag & 1): 1; - mask[mface->v2]= selectedVerts ? ((mv+mface->v2)->flag & 1): 1; - mask[mface->v3]= selectedVerts ? ((mv+mface->v3)->flag & 1): 1; + if(mask && ((mface->flag & ME_FACE_SEL) || use_vert_sel)) { + mask[mface->v1]= use_vert_sel ? ((mv+mface->v1)->flag & 1): 1; + mask[mface->v2]= use_vert_sel ? ((mv+mface->v2)->flag & 1): 1; + mask[mface->v3]= use_vert_sel ? ((mv+mface->v3)->flag & 1): 1; if(mface->v4) - mask[mface->v4]= selectedVerts ? ((mv+mface->v4)->flag & 1): 1; + mask[mface->v4]= use_vert_sel ? ((mv+mface->v4)->flag & 1): 1; } } |