From 4ce1829289b0b5f5632e0b6f2a70feb122575820 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 15 May 2020 12:47:47 +1000 Subject: Cleanup: don't check flags as booleans Causes unexpected behavior when adding new flags. --- source/blender/draw/engines/overlay/overlay_grid.c | 3 ++- source/blender/makesdna/DNA_view3d_types.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'source') diff --git a/source/blender/draw/engines/overlay/overlay_grid.c b/source/blender/draw/engines/overlay/overlay_grid.c index f824f7736d2..5ed32de6d93 100644 --- a/source/blender/draw/engines/overlay/overlay_grid.c +++ b/source/blender/draw/engines/overlay/overlay_grid.c @@ -63,7 +63,8 @@ void OVERLAY_grid_init(OVERLAY_Data *vedata) shd->zneg_flag = 0; shd->zpos_flag = 0; - if (pd->hide_overlays || !pd->v3d_gridflag) { + if (pd->hide_overlays || !(pd->v3d_gridflag & (V3D_SHOW_X | V3D_SHOW_Y | V3D_SHOW_Z | + V3D_SHOW_FLOOR | V3D_SHOW_ORTHO_GRID))) { return; } diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h index 21def800e4a..27097dc160c 100644 --- a/source/blender/makesdna/DNA_view3d_types.h +++ b/source/blender/makesdna/DNA_view3d_types.h @@ -548,7 +548,7 @@ enum { V3D_AROUND_ACTIVE = 4, }; -/** #View3d.gridflag */ +/** #View3D.gridflag */ #define V3D_SHOW_FLOOR (1 << 0) #define V3D_SHOW_X (1 << 1) #define V3D_SHOW_Y (1 << 2) -- cgit v1.2.3