diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-12-22 18:25:34 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-12-22 18:25:34 +0400 |
| commit | 7dca6dbf0bf7606a76f87079ba6e7d1a7cc99f47 (patch) | |
| tree | eae143be0fc381c616089fdc36dc65af4d309296 /source/blender/editors/object | |
| parent | 4c5093ad48f1e56b6b32ad729882461b4001ef62 (diff) | |
code cleanup:
make vertex/weight flag names consistent
ME_EDIT_VERT_SEL --> ME_EDIT_PAINT_VERT_SEL
ME_EDIT_PAINT_MASK --> ME_EDIT_PAINT_FACE_SEL
also remove unused header BLO_soundfile.h
Diffstat (limited to 'source/blender/editors/object')
| -rw-r--r-- | source/blender/editors/object/object_vgroup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index 40e8fe72e8c..e7c619acb67 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -88,7 +88,7 @@ static int vertex_group_use_vert_sel(Object *ob) if (ob->mode == OB_MODE_EDIT) { return TRUE; } - else if (ob->type == OB_MESH && ((Mesh *)ob->data)->editflag & ME_EDIT_VERT_SEL) { + else if (ob->type == OB_MESH && ((Mesh *)ob->data)->editflag & ME_EDIT_PAINT_VERT_SEL) { return TRUE; } else { @@ -1410,7 +1410,7 @@ static void vgroup_fix(Scene *scene, Object *ob, float distToBe, float strength, Mesh *me = ob->data; MVert *mvert = me->mvert; int *verts = NULL; - if (!(me->editflag & ME_EDIT_VERT_SEL)) + if (!(me->editflag & ME_EDIT_PAINT_VERT_SEL)) return; for (i = 0; i < me->totvert && mvert; i++, mvert++) { if (mvert->flag & SELECT) { @@ -2071,7 +2071,7 @@ void ED_vgroup_mirror(Object *ob, const short mirror_weights, const short flip_v /* object mode / weight paint */ MVert *mv, *mv_mirr; int vidx, vidx_mirr; - const int use_vert_sel = (me->editflag & ME_EDIT_VERT_SEL) != 0; + const int use_vert_sel = (me->editflag & ME_EDIT_PAINT_VERT_SEL) != 0; if (me->dvert == NULL) { goto cleanup; |