diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-23 04:23:11 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-23 04:23:11 +0400 |
| commit | 40449b1994301081f96d014df626a5375e020c76 (patch) | |
| tree | 20220d8b071310fda8a0ab851c7a8f7bcc3ed8a2 /source/blender/makesdna/DNA_mesh_types.h | |
| parent | fa0211df269a3398dd70467982f9e129c79e501b (diff) | |
| parent | 3ca00cbf541d0283e91dc454866a5f24576271be (diff) | |
Merged changes in the trunk up to revision 53280.
Diffstat (limited to 'source/blender/makesdna/DNA_mesh_types.h')
| -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 4f47ed76d50..da7ea94aeff 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 \ ) |