diff options
author | Antonio Vazquez <blendergit@gmail.com> | 2020-05-03 21:42:37 +0300 |
---|---|---|
committer | Antonio Vazquez <blendergit@gmail.com> | 2020-05-03 21:42:37 +0300 |
commit | 57cfa8e2d0fa3852b455d4afefc0be74aab906d5 (patch) | |
tree | 80986566e306dca7e0bb92a1848f80c760c764e3 | |
parent | bbfae8f184610c032ad918a71c99886a231197d3 (diff) | |
parent | 331bf04fad9389cb572ad4c07aab38f5264d9b0e (diff) |
Merge branch 'blender-v2.83-release'
-rw-r--r-- | source/blender/draw/engines/overlay/overlay_gpencil.c | 4 |
1 files changed, 3 insertions, 1 deletions
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; |