[Bf-blender-cvs] [d4982f19116] greasepencil-object: GPencil: Canvas grid must be invisible for Stroke and Surface modes

[Antonioya]

Commit: d4982f19116a7f57345342d221240b0ec4a585f5
Author: Antonioya
Date:   Fri Mar 15 17:24:49 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rBd4982f19116a7f57345342d221240b0ec4a585f5

GPencil: Canvas grid must be invisible for Stroke and Surface modes

In these modes, the grid is not used, so it's not logic show somthing that is not used.

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

M	source/blender/draw/engines/gpencil/gpencil_engine.c

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

diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c
index d5ede897467..c119e917253 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@ -627,7 +627,9 @@ void GPENCIL_cache_populate(void *vedata, Object *ob)
 		if ((v3d) &&
 		    ((v3d->flag2 & V3D_HIDE_OVERLAYS) == 0) &&
 		    (v3d->gp_flag & V3D_GP_SHOW_GRID) &&
-		    (ob->type == OB_GPENCIL) && (ob == draw_ctx->obact))
+		    (ob->type == OB_GPENCIL) && (ob == draw_ctx->obact) &&
+			((ts->gpencil_v3d_align & GP_PROJECT_DEPTH_VIEW) == 0) &&
+			((ts->gpencil_v3d_align & GP_PROJECT_DEPTH_STROKE) == 0))
 		{
 			GPU_BATCH_DISCARD_SAFE(e_data.batch_grid);
 			MEM_SAFE_FREE(e_data.batch_grid);