diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-12-17 02:25:40 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-12-17 02:25:40 +0300 |
| commit | 9149e8942107343fb31639406124428e6ff1a029 (patch) | |
| tree | d33495dc55c5d50206437598ddcfffa24843be61 /source/blender/makesdna/DNA_color_types.h | |
| parent | ea33b90a1bf21061ab8a862d862db4dea048b28c (diff) | |
| parent | 98f43ba3e4cb0a26eb62ea98e27a313265f8948c (diff) | |
Merge branch 'master' into blende2.8
Diffstat (limited to 'source/blender/makesdna/DNA_color_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_color_types.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/makesdna/DNA_color_types.h b/source/blender/makesdna/DNA_color_types.h index bf205729a72..2c6411ad375 100644 --- a/source/blender/makesdna/DNA_color_types.h +++ b/source/blender/makesdna/DNA_color_types.h @@ -48,9 +48,9 @@ typedef struct CurveMapPoint { /* curvepoint->flag */ enum { - CUMA_SELECT = 1, - CUMA_HANDLE_VECTOR = 2, - CUMA_HANDLE_AUTO_ANIM = 4, + CUMA_SELECT = (1 << 0), + CUMA_HANDLE_VECTOR = (1 << 1), + CUMA_HANDLE_AUTO_ANIM = (1 << 2), }; typedef struct CurveMap { @@ -88,10 +88,10 @@ typedef struct CurveMapping { } CurveMapping; /* cumapping->flag */ -#define CUMA_DO_CLIP 1 -#define CUMA_PREMULLED 2 -#define CUMA_DRAW_CFRA 4 -#define CUMA_DRAW_SAMPLE 8 +#define CUMA_DO_CLIP (1 << 0) +#define CUMA_PREMULLED (1 << 1) +#define CUMA_DRAW_CFRA (1 << 2) +#define CUMA_DRAW_SAMPLE (1 << 3) /* cumapping->preset */ typedef enum eCurveMappingPreset { |