[Bf-blender-cvs] [2942e7eb03c] greasepencil-refactor: GPencil: Refactor: Don't draw Gpencil objects if drawtype is not solid

[Clément Foucault]

Commit: 2942e7eb03c507f20233155631908056e3ebf39b
Author: Clément Foucault
Date:   Thu Jan 9 20:42:14 2020 +0100
Branches: greasepencil-refactor
https://developer.blender.org/rB2942e7eb03c507f20233155631908056e3ebf39b

GPencil: Refactor: Don't draw Gpencil objects if drawtype is not solid

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

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

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

diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c
index 2c78824a737..438b84b08b0 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@ -538,7 +538,7 @@ void GPENCIL_cache_populate(void *ved, Object *ob)
     return;
   }
 
-  if (ob->type == OB_GPENCIL && ob->data) {
+  if (ob->data && (ob->type == OB_GPENCIL) && (ob->dt >= OB_SOLID)) {
     gpIterPopulateData iter = {0};
     iter.ob = ob;
     iter.pd = pd;
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 2ae4ca12d56..3816b1af0a7 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -1357,7 +1357,7 @@ static void drw_engines_enable(ViewLayer *UNUSED(view_layer),
   const bool use_xray = XRAY_ENABLED(v3d);
 
   drw_engines_enable_from_engine(engine_type, drawtype, use_xray);
-  if (gpencil_engine_needed) {
+  if (gpencil_engine_needed && (drawtype >= OB_SOLID)) {
     use_drw_engine(&draw_engine_gpencil_type);
   }
   drw_engines_enable_overlays();