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/makesdna | |
| 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/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_mesh_types.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h index dd0845dbf1e..05f8d2645ad 100644 --- a/source/blender/makesdna/DNA_mesh_types.h +++ b/source/blender/makesdna/DNA_mesh_types.h @@ -147,15 +147,15 @@ typedef struct TFace { #define ME_EDIT_MIRROR_Y (1 << 1) // unused so far #define ME_EDIT_MIRROR_Z (1 << 2) // unused so far -#define ME_EDIT_PAINT_MASK (1 << 3) +#define ME_EDIT_PAINT_FACE_SEL (1 << 3) #define ME_EDIT_MIRROR_TOPO (1 << 4) -#define ME_EDIT_VERT_SEL (1 << 5) +#define ME_EDIT_PAINT_VERT_SEL (1 << 5) /* we cant have both flags enabled at once, * flags defined in DNA_scene_types.h */ #define ME_EDIT_PAINT_SEL_MODE(_me) ( \ - (_me->editflag & ME_EDIT_PAINT_MASK) ? SCE_SELECT_FACE : \ - (_me->editflag & ME_EDIT_VERT_SEL) ? SCE_SELECT_VERTEX : \ + (_me->editflag & ME_EDIT_PAINT_FACE_SEL) ? SCE_SELECT_FACE : \ + (_me->editflag & ME_EDIT_PAINT_VERT_SEL) ? SCE_SELECT_VERTEX : \ 0 \ ) |