From 331bf04fad9389cb572ad4c07aab38f5264d9b0e Mon Sep 17 00:00:00 2001 From: Antonio Vazquez Date: Sun, 3 May 2020 20:42:18 +0200 Subject: 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. --- source/blender/draw/engines/overlay/overlay_gpencil.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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; -- cgit v1.2.3