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_view3d_types.h | |
| parent | ea33b90a1bf21061ab8a862d862db4dea048b28c (diff) | |
| parent | 98f43ba3e4cb0a26eb62ea98e27a313265f8948c (diff) | |
Merge branch 'master' into blende2.8
Diffstat (limited to 'source/blender/makesdna/DNA_view3d_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_view3d_types.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h index 09b125bdcd8..c402192c02a 100644 --- a/source/blender/makesdna/DNA_view3d_types.h +++ b/source/blender/makesdna/DNA_view3d_types.h @@ -308,14 +308,14 @@ typedef struct View3D { /* View3D->flag (short) */ /*#define V3D_FLAG_DEPRECATED_1 (1 << 0) */ /*UNUSED */ /*#define V3D_FLAG_DEPRECATED_2 (1 << 1) */ /* UNUSED */ -#define V3D_HIDE_HELPLINES 4 -#define V3D_INVALID_BACKBUF 8 +#define V3D_HIDE_HELPLINES (1 << 2) +#define V3D_INVALID_BACKBUF (1 << 3) /* #define V3D_FLAG_DEPRECATED_10 (1 << 10) */ /* UNUSED */ -#define V3D_SELECT_OUTLINE 2048 -#define V3D_ZBUF_SELECT 4096 /* XXX: DNA deprecated */ -#define V3D_GLOBAL_STATS 8192 -#define V3D_DRAW_CENTERS 32768 +#define V3D_SELECT_OUTLINE (1 << 11) +#define V3D_ZBUF_SELECT (1 << 12) /* XXX: DNA deprecated */ +#define V3D_GLOBAL_STATS (1 << 13) +#define V3D_DRAW_CENTERS (1 << 15) /* RegionView3d->persp */ #define RV3D_ORTHO 0 @@ -323,10 +323,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 *//* UNUSED */ +#define RV3D_CLIPPING (1 << 2) +#define RV3D_NAVIGATING (1 << 3) +#define RV3D_GPULIGHT_UPDATE (1 << 4) +/*#define RV3D_IS_GAME_ENGINE (1 << 5) *//* UNUSED */ /** * Disable zbuffer offset, skip calls to #ED_view3d_polygon_offset. * Use when precise surface depth is needed and picking bias isn't, see T45434). @@ -508,10 +508,10 @@ 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) /* Scene.orientation_type */ #define V3D_MANIP_GLOBAL 0 |