[Bf-blender-cvs] [2e23814ab63] greasepencil-object: GPencil: Disable VFX in Material shding mode

[Antonio Vazquez]

Commit: 2e23814ab63e5f3d120bb274c0462ddc1292f439
Author: Antonio Vazquez
Date:   Tue Mar 3 19:04:37 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rB2e23814ab63e5f3d120bb274c0462ddc1292f439

GPencil: Disable VFX in Material shding mode

The VFX must be visible only in Render mode, as Lights.

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

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 5ea482cce03..b3990bcb8b1 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@ -207,7 +207,7 @@ void GPENCIL_cache_init(void *ved)
     Scene *scene = draw_ctx->scene;
     pd->simplify_fill = GPENCIL_SIMPLIFY_FILL(scene, playing);
     pd->simplify_fx = GPENCIL_SIMPLIFY_FX(scene, playing) ||
-                      (draw_ctx->v3d->shading.type < OB_MATERIAL);
+                      (draw_ctx->v3d->shading.type < OB_RENDER);
 
     /* Fade Layer. */
     const bool is_fade_layer = ((!hide_overlay) && (!pd->is_render) &&