[Bf-blender-cvs] [4ce1829289b] blender-v2.83-release: Cleanup: don't check flags as booleans

[Campbell Barton]

Commit: 4ce1829289b0b5f5632e0b6f2a70feb122575820
Author: Campbell Barton
Date:   Fri May 15 12:47:47 2020 +1000
Branches: blender-v2.83-release
https://developer.blender.org/rB4ce1829289b0b5f5632e0b6f2a70feb122575820

Cleanup: don't check flags as booleans

Causes unexpected behavior when adding new flags.

===================================================================

M	source/blender/draw/engines/overlay/overlay_grid.c
M	source/blender/makesdna/DNA_view3d_types.h

===================================================================

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)