diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-05-15 05:52:31 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-05-15 05:52:31 +0300 |
| commit | 191c562f98ed8c12d505c1c625b577628ef9a804 (patch) | |
| tree | 68f1521bf08163f56f7363aacf26047133f163cc /source/blender/draw | |
| parent | c880e54a95dd352262f71cb0834e01fdfbdf000c (diff) | |
| parent | 4ce1829289b0b5f5632e0b6f2a70feb122575820 (diff) | |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender/draw')
| -rw-r--r-- | source/blender/draw/engines/overlay/overlay_grid.c | 3 |
1 files changed, 2 insertions, 1 deletions
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; } |