[Bf-blender-cvs] [e21c6c5785c] greasepencil-object: GPencil: Disable VFXs in Solid mode

[Antonio Vazquez]

Commit: e21c6c5785cc8c66b520caaa45399ce222e1331c
Author: Antonio Vazquez
Date:   Sat Feb 15 10:13:39 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rBe21c6c5785cc8c66b520caaa45399ce222e1331c

GPencil: Disable VFXs in Solid mode

The VFX must be visible in Material or Render shading mode only.

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

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 8352037ef16..8c618c1befb 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@ -206,7 +206,8 @@ void GPENCIL_cache_init(void *ved)
     /* Save simplify flags (can change while drawing, so it's better to save). */
     Scene *scene = draw_ctx->scene;
     pd->simplify_fill = GPENCIL_SIMPLIFY_FILL(scene, playing);
-    pd->simplify_fx = GPENCIL_SIMPLIFY_FX(scene, playing);
+    pd->simplify_fx = GPENCIL_SIMPLIFY_FX(scene, playing) ||
+                      (draw_ctx->v3d->shading.type < OB_MATERIAL);
 
     /* Fade Layer. */
     const bool is_fade_layer = ((!hide_overlay) && (!pd->is_render) &&