[Bf-blender-cvs] [aca222c3da2] master: Fix unnecessary grease pencil drawing when there are no grease pencil objects

[Ulysse Martin]

Commit: aca222c3da20c0c48d12124af4c4041579a5690e
Author: Ulysse Martin
Date:   Mon Mar 9 17:03:13 2020 +0100
Branches: master
https://developer.blender.org/rBaca222c3da20c0c48d12124af4c4041579a5690e

Fix unnecessary grease pencil drawing when there are no grease pencil objects

Differential Revision: https://developer.blender.org/D6551

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

M	source/blender/draw/intern/draw_manager.c

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

diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 85caf0825e0..85b071f5c89 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -1216,7 +1216,7 @@ static bool drw_gpencil_engine_needed(Depsgraph *depsgraph, View3D *v3d)
   const bool exclude_gpencil_rendering = v3d ? (v3d->object_type_exclude_viewport &
                                                 (1 << OB_GPENCIL)) != 0 :
                                                false;
-  return (!exclude_gpencil_rendering) || DEG_id_type_any_exists(depsgraph, ID_GD);
+  return (!exclude_gpencil_rendering) && DEG_id_type_any_exists(depsgraph, ID_GD);
 }
 
 /* -------------------------------------------------------------------- */