Merged changes in the trunk up to revision 53280.
[blender.git] / source / blender / makesdna / DNA_mesh_types.h
index 4f47ed76d507d44668c543aafcbe9c60702bd86e..da7ea94aeff4a27c1096f713510a67dac6ff2f84 100644 (file)
@@ -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                                                                 \
        )