diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-11-02 10:19:04 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-02 10:19:04 +0400 |
commit | 439f57d361322bbe521cfd3e60dfd6534ca22c6d (patch) | |
tree | 3e6b01a0eb00cb5d03e09257bd1d36c4480e1323 /source/blender/makesdna/DNA_mesh_types.h | |
parent | 5c5bb9276ecf4e8da281b66ad9d722f4a1102d81 (diff) | |
parent | 43e297c0c0cd18b0a9666fa55a4dc9411911ef24 (diff) |
svn merge ^/trunk/blender/ -r41453:41458
Diffstat (limited to 'source/blender/makesdna/DNA_mesh_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_mesh_types.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h index c38e8d02954..125c18fa7c4 100644 --- a/source/blender/makesdna/DNA_mesh_types.h +++ b/source/blender/makesdna/DNA_mesh_types.h @@ -142,6 +142,14 @@ typedef struct TFace { #define ME_EDIT_MIRROR_TOPO (1 << 4) #define ME_EDIT_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 : \ + 0 \ + ) + /* me->flag */ /* #define ME_ISDONE 1 */ #define ME_DEPRECATED 2 |