[Bf-blender-cvs] [331bf04fad9] blender-v2.83-release: GPencil: Hide Canvas Grid when Surface or Stroke mode is enabled

[Antonio Vazquez]

Commit: 331bf04fad9389cb572ad4c07aab38f5264d9b0e
Author: Antonio Vazquez
Date:   Sun May 3 20:42:18 2020 +0200
Branches: blender-v2.83-release
https://developer.blender.org/rB331bf04fad9389cb572ad4c07aab38f5264d9b0e

GPencil: Hide Canvas Grid when Surface or Stroke mode is enabled

This was introduced by error during refactor. The grid must not be visible in these modes.

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

M	source/blender/draw/engines/overlay/overlay_gpencil.c

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

diff --git a/source/blender/draw/engines/overlay/overlay_gpencil.c b/source/blender/draw/engines/overlay/overlay_gpencil.c
index 05c159359ff..b79d5753686 100644
--- a/source/blender/draw/engines/overlay/overlay_gpencil.c
+++ b/source/blender/draw/engines/overlay/overlay_gpencil.c
@@ -201,7 +201,9 @@ void OVERLAY_gpencil_cache_init(OVERLAY_Data *vedata)
   }
 
   const bool show_overlays = (v3d->flag2 & V3D_HIDE_OVERLAYS) == 0;
-  const bool show_grid = (v3d->gp_flag & V3D_GP_SHOW_GRID) != 0;
+  const bool show_grid = (v3d->gp_flag & V3D_GP_SHOW_GRID) != 0 &&
+                         ((ts->gpencil_v3d_align &
+                           (GP_PROJECT_DEPTH_VIEW | GP_PROJECT_DEPTH_STROKE)) == 0);
 
   if (show_grid && show_overlays) {
     const char *grid_unit = NULL;