diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-12-17 01:55:02 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-12-17 01:55:47 +0300 |
| commit | 98f43ba3e4cb0a26eb62ea98e27a313265f8948c (patch) | |
| tree | 5a54513b8b0cef1b9a66be0cd04bb13d21c78643 /source/blender/makesdna/DNA_view3d_types.h | |
| parent | 4e3562f45ad6109fe3913c5ec7b2d5ff9c6f97bc (diff) | |
Cleanup: use bit-shifted flag definitions in DNA
Diffstat (limited to 'source/blender/makesdna/DNA_view3d_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_view3d_types.h | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h index aaf7d8c5290..1c14c13ce90 100644 --- a/source/blender/makesdna/DNA_view3d_types.h +++ b/source/blender/makesdna/DNA_view3d_types.h @@ -251,16 +251,16 @@ typedef struct View3D { #define V3D_S3D_DISPVOLUME (1 << 2) /* View3D->flag (short) */ -/*#define V3D_DISPIMAGE 1*/ /*UNUSED*/ -#define V3D_DISPBGPICS 2 -#define V3D_HIDE_HELPLINES 4 -#define V3D_INVALID_BACKBUF 8 +/*#define V3D_DISPIMAGE (1 << 0) */ /*UNUSED*/ +#define V3D_DISPBGPICS (1 << 1) +#define V3D_HIDE_HELPLINES (1 << 2) +#define V3D_INVALID_BACKBUF (1 << 3) -#define V3D_ALIGN 1024 -#define V3D_SELECT_OUTLINE 2048 -#define V3D_ZBUF_SELECT 4096 -#define V3D_GLOBAL_STATS 8192 -#define V3D_DRAW_CENTERS 32768 +#define V3D_ALIGN (1 << 10) +#define V3D_SELECT_OUTLINE (1 << 11) +#define V3D_ZBUF_SELECT (1 << 12) +#define V3D_GLOBAL_STATS (1 << 13) +#define V3D_DRAW_CENTERS (1 << 15) /* RegionView3d->persp */ #define RV3D_ORTHO 0 @@ -268,10 +268,10 @@ typedef struct View3D { #define RV3D_CAMOB 2 /* RegionView3d->rflag */ -#define RV3D_CLIPPING 4 -#define RV3D_NAVIGATING 8 -#define RV3D_GPULIGHT_UPDATE 16 -#define RV3D_IS_GAME_ENGINE 32 /* runtime flag, used to check if LoD's should be used */ +#define RV3D_CLIPPING (1 << 2) +#define RV3D_NAVIGATING (1 << 3) +#define RV3D_GPULIGHT_UPDATE (1 << 4) +#define RV3D_IS_GAME_ENGINE (1 << 5) /* runtime flag, used to check if LoD's should be used */ /** * Disable zbuffer offset, skip calls to #ED_view3d_polygon_offset. * Use when precise surface depth is needed and picking bias isn't, see T45434). @@ -341,15 +341,15 @@ enum { #define V3D_VIEW_PANUP 8 /* View3d->gridflag */ -#define V3D_SHOW_FLOOR 1 -#define V3D_SHOW_X 2 -#define V3D_SHOW_Y 4 -#define V3D_SHOW_Z 8 +#define V3D_SHOW_FLOOR (1 << 0) +#define V3D_SHOW_X (1 << 1) +#define V3D_SHOW_Y (1 << 2) +#define V3D_SHOW_Z (1 << 3) /* View3d->twtype (bits, we can combine them) */ -#define V3D_MANIP_TRANSLATE 1 -#define V3D_MANIP_ROTATE 2 -#define V3D_MANIP_SCALE 4 +#define V3D_MANIP_TRANSLATE (1 << 0) +#define V3D_MANIP_ROTATE (1 << 1) +#define V3D_MANIP_SCALE (1 << 2) /* View3d->twmode */ #define V3D_MANIP_GLOBAL 0 @@ -361,9 +361,9 @@ enum { /* View3d->twflag */ /* USE = user setting, DRAW = based on selection */ -#define V3D_USE_MANIPULATOR 1 -#define V3D_DRAW_MANIPULATOR 2 -/* #define V3D_CALC_MANIPULATOR 4 */ /*UNUSED*/ +#define V3D_USE_MANIPULATOR (1 << 0) +#define V3D_DRAW_MANIPULATOR (1 << 1) +/* #define V3D_CALC_MANIPULATOR (1 << 2) */ /*UNUSED*/ /* BGPic->flag */ /* may want to use 1 for select ? */ |