From 19b5f5493cd6a9b60486d570b6a50c7a42a96ae0 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sat, 26 Jan 2019 20:07:31 +1100
Subject: Cleanup: draw manager headers

---
 source/blender/draw/engines/basic/basic_engine.c            |  3 ---
 source/blender/draw/engines/eevee/eevee_bloom.c             |  3 ---
 source/blender/draw/engines/eevee/eevee_depth_of_field.c    | 13 -------------
 source/blender/draw/engines/eevee/eevee_effects.c           |  2 --
 source/blender/draw/engines/eevee/eevee_engine.c            |  6 ------
 source/blender/draw/engines/eevee/eevee_lightcache.c        |  1 -
 source/blender/draw/engines/eevee/eevee_lightprobes.c       |  4 ----
 source/blender/draw/engines/eevee/eevee_lights.c            |  1 -
 source/blender/draw/engines/eevee/eevee_materials.c         |  1 -
 source/blender/draw/engines/eevee/eevee_motion_blur.c       |  3 ---
 source/blender/draw/engines/eevee/eevee_occlusion.c         |  1 -
 source/blender/draw/engines/eevee/eevee_render.c            |  2 --
 source/blender/draw/engines/eevee/eevee_temporal_sampling.c |  1 -
 source/blender/draw/engines/eevee/eevee_volumes.c           |  2 --
 source/blender/draw/engines/external/external_engine.c      |  6 ------
 .../blender/draw/engines/gpencil/gpencil_draw_cache_impl.c  |  3 ---
 source/blender/draw/engines/gpencil/gpencil_draw_utils.c    |  3 ---
 source/blender/draw/engines/gpencil/gpencil_engine.c        |  6 ------
 source/blender/draw/engines/gpencil/gpencil_render.c        |  2 --
 source/blender/draw/engines/gpencil/gpencil_shader_fx.c     |  6 ------
 source/blender/draw/engines/workbench/workbench_deferred.c  |  3 ---
 source/blender/draw/engines/workbench/workbench_forward.c   |  3 ---
 .../blender/draw/engines/workbench/workbench_studiolight.c  |  2 --
 source/blender/draw/engines/workbench/workbench_volume.c    |  1 -
 24 files changed, 78 deletions(-)

(limited to 'source/blender/draw/engines')

diff --git a/source/blender/draw/engines/basic/basic_engine.c b/source/blender/draw/engines/basic/basic_engine.c
index 7f4da54e63d..f6a6d89cc40 100644
--- a/source/blender/draw/engines/basic/basic_engine.c
+++ b/source/blender/draw/engines/basic/basic_engine.c
@@ -31,9 +31,6 @@
 
 #include "DRW_render.h"
 
-#include "BKE_icons.h"
-#include "BKE_idprop.h"
-#include "BKE_main.h"
 #include "BKE_particle.h"
 
 #include "DNA_particle_types.h"
diff --git a/source/blender/draw/engines/eevee/eevee_bloom.c b/source/blender/draw/engines/eevee/eevee_bloom.c
index 14adc43e84d..3402a7c1cab 100644
--- a/source/blender/draw/engines/eevee/eevee_bloom.c
+++ b/source/blender/draw/engines/eevee/eevee_bloom.c
@@ -30,11 +30,8 @@
 
 #include "DRW_render.h"
 
-#include "BLI_dynstr.h"
 
-#include "BKE_global.h" /* for G.debug_value */
 
-#include "GPU_extensions.h"
 #include "GPU_texture.h"
 
 #include "DEG_depsgraph_query.h"
diff --git a/source/blender/draw/engines/eevee/eevee_depth_of_field.c b/source/blender/draw/engines/eevee/eevee_depth_of_field.c
index 7c66a32f5fa..79ecc6703d6 100644
--- a/source/blender/draw/engines/eevee/eevee_depth_of_field.c
+++ b/source/blender/draw/engines/eevee/eevee_depth_of_field.c
@@ -30,33 +30,20 @@
 
 #include "DRW_render.h"
 
-#include "BLI_dynstr.h"
-#include "BLI_rand.h"
-
-#include "DNA_anim_types.h"
 #include "DNA_camera_types.h"
-#include "DNA_object_force_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_view3d_types.h"
 #include "DNA_world_types.h"
 
-#include "BKE_global.h" /* for G.debug_value */
 #include "BKE_camera.h"
-#include "BKE_mesh.h"
-#include "BKE_object.h"
-#include "BKE_animsys.h"
-#include "BKE_screen.h"
 
 #include "DEG_depsgraph.h"
 #include "DEG_depsgraph_query.h"
 
 #include "eevee_private.h"
-#include "GPU_extensions.h"
 #include "GPU_framebuffer.h"
 #include "GPU_texture.h"
 
-#include "ED_screen.h"
-
 static struct {
 	/* Depth Of Field */
 	struct GPUShader *dof_downsample_sh[2];
diff --git a/source/blender/draw/engines/eevee/eevee_effects.c b/source/blender/draw/engines/eevee/eevee_effects.c
index 09f88fb3ee8..96890c6ada7 100644
--- a/source/blender/draw/engines/eevee/eevee_effects.c
+++ b/source/blender/draw/engines/eevee/eevee_effects.c
@@ -32,8 +32,6 @@
 
 #include "BKE_global.h" /* for G.debug_value */
 
-#include "BLI_string_utils.h"
-
 #include "eevee_private.h"
 #include "GPU_texture.h"
 #include "GPU_extensions.h"
diff --git a/source/blender/draw/engines/eevee/eevee_engine.c b/source/blender/draw/engines/eevee/eevee_engine.c
index 7f6f485644c..7fc15342c7c 100644
--- a/source/blender/draw/engines/eevee/eevee_engine.c
+++ b/source/blender/draw/engines/eevee/eevee_engine.c
@@ -28,21 +28,15 @@
 
 #include "DRW_render.h"
 
-#include "BLI_dynstr.h"
 #include "BLI_rand.h"
 
 #include "BKE_object.h"
 #include "BKE_global.h" /* for G.debug_value */
-#include "BKE_screen.h"
 
 #include "DNA_world_types.h"
 
-#include "ED_screen.h"
 
-#include "GPU_material.h"
-#include "GPU_glew.h"
 
-#include "eevee_engine.h"
 #include "eevee_private.h"
 
 #define EEVEE_ENGINE "BLENDER_EEVEE"
diff --git a/source/blender/draw/engines/eevee/eevee_lightcache.c b/source/blender/draw/engines/eevee/eevee_lightcache.c
index 0420e85ee70..410ea18d876 100644
--- a/source/blender/draw/engines/eevee/eevee_lightcache.c
+++ b/source/blender/draw/engines/eevee/eevee_lightcache.c
@@ -31,7 +31,6 @@
 #include "DRW_render.h"
 
 #include "BKE_global.h"
-#include "BKE_blender.h"
 
 #include "BLI_threads.h"
 
diff --git a/source/blender/draw/engines/eevee/eevee_lightprobes.c b/source/blender/draw/engines/eevee/eevee_lightprobes.c
index 601073a7be2..d278d6bb54b 100644
--- a/source/blender/draw/engines/eevee/eevee_lightprobes.c
+++ b/source/blender/draw/engines/eevee/eevee_lightprobes.c
@@ -29,7 +29,6 @@
 #include "DRW_render.h"
 
 #include "BLI_utildefines.h"
-#include "BLI_string_utils.h"
 #include "BLI_rand.h"
 
 #include "DNA_world_types.h"
@@ -44,15 +43,12 @@
 
 #include "GPU_material.h"
 #include "GPU_texture.h"
-#include "GPU_glew.h"
 
 #include "DEG_depsgraph_query.h"
 
-#include "eevee_engine.h"
 #include "eevee_lightcache.h"
 #include "eevee_private.h"
 
-#include "ED_screen.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
diff --git a/source/blender/draw/engines/eevee/eevee_lights.c b/source/blender/draw/engines/eevee/eevee_lights.c
index 57a93a27ca0..a95edfb1884 100644
--- a/source/blender/draw/engines/eevee/eevee_lights.c
+++ b/source/blender/draw/engines/eevee/eevee_lights.c
@@ -36,7 +36,6 @@
 
 #include "DEG_depsgraph_query.h"
 
-#include "eevee_engine.h"
 #include "eevee_private.h"
 
 #define SHADOW_CASTER_ALLOC_CHUNK 16
diff --git a/source/blender/draw/engines/eevee/eevee_materials.c b/source/blender/draw/engines/eevee/eevee_materials.c
index 527fa515deb..f4c3bb6ca85 100644
--- a/source/blender/draw/engines/eevee/eevee_materials.c
+++ b/source/blender/draw/engines/eevee/eevee_materials.c
@@ -37,7 +37,6 @@
 #include "BKE_particle.h"
 #include "BKE_paint.h"
 #include "BKE_pbvh.h"
-#include "BKE_studiolight.h"
 
 #include "DNA_world_types.h"
 #include "DNA_modifier_types.h"
diff --git a/source/blender/draw/engines/eevee/eevee_motion_blur.c b/source/blender/draw/engines/eevee/eevee_motion_blur.c
index 369a77d0421..33e11c3017b 100644
--- a/source/blender/draw/engines/eevee/eevee_motion_blur.c
+++ b/source/blender/draw/engines/eevee/eevee_motion_blur.c
@@ -30,17 +30,14 @@
 
 #include "DRW_render.h"
 
-#include "BKE_global.h" /* for G.debug_value */
 #include "BKE_camera.h"
 #include "BKE_object.h"
 #include "BKE_animsys.h"
-#include "BKE_screen.h"
 
 #include "DNA_anim_types.h"
 #include "DNA_camera_types.h"
 #include "DNA_screen_types.h"
 
-#include "ED_screen.h"
 
 #include "DEG_depsgraph.h"
 #include "DEG_depsgraph_query.h"
diff --git a/source/blender/draw/engines/eevee/eevee_occlusion.c b/source/blender/draw/engines/eevee/eevee_occlusion.c
index 8c76f3a500b..676d941b6d1 100644
--- a/source/blender/draw/engines/eevee/eevee_occlusion.c
+++ b/source/blender/draw/engines/eevee/eevee_occlusion.c
@@ -32,7 +32,6 @@
 
 #include "BLI_string_utils.h"
 
-#include "DNA_anim_types.h"
 
 #include "DEG_depsgraph_query.h"
 
diff --git a/source/blender/draw/engines/eevee/eevee_render.c b/source/blender/draw/engines/eevee/eevee_render.c
index 6e2cac6dbce..ac6f0720d7d 100644
--- a/source/blender/draw/engines/eevee/eevee_render.c
+++ b/source/blender/draw/engines/eevee/eevee_render.c
@@ -36,7 +36,6 @@
 #include "DNA_node_types.h"
 #include "DNA_object_types.h"
 
-#include "BKE_camera.h"
 #include "BKE_object.h"
 
 #include "BLI_rand.h"
@@ -45,7 +44,6 @@
 #include "DEG_depsgraph_query.h"
 
 #include "GPU_framebuffer.h"
-#include "GPU_glew.h"
 #include "GPU_state.h"
 
 #include "RE_pipeline.h"
diff --git a/source/blender/draw/engines/eevee/eevee_temporal_sampling.c b/source/blender/draw/engines/eevee/eevee_temporal_sampling.c
index 480ff87a5eb..aa86b619185 100644
--- a/source/blender/draw/engines/eevee/eevee_temporal_sampling.c
+++ b/source/blender/draw/engines/eevee/eevee_temporal_sampling.c
@@ -33,7 +33,6 @@
 #include "ED_screen.h"
 
 #include "BLI_rand.h"
-#include "BLI_string_utils.h"
 
 #include "DEG_depsgraph_query.h"
 
diff --git a/source/blender/draw/engines/eevee/eevee_volumes.c b/source/blender/draw/engines/eevee/eevee_volumes.c
index 58e932f6e5c..0601fd4a7f9 100644
--- a/source/blender/draw/engines/eevee/eevee_volumes.c
+++ b/source/blender/draw/engines/eevee/eevee_volumes.c
@@ -37,10 +37,8 @@
 #include "DNA_smoke_types.h"
 #include "DNA_world_types.h"
 
-#include "BKE_global.h" /* for G.debug_value */
 #include "BKE_modifier.h"
 #include "BKE_mesh.h"
-#include "BKE_object.h"
 
 #include "ED_screen.h"
 
diff --git a/source/blender/draw/engines/external/external_engine.c b/source/blender/draw/engines/external/external_engine.c
index 26586aef84d..fee0dda5f21 100644
--- a/source/blender/draw/engines/external/external_engine.c
+++ b/source/blender/draw/engines/external/external_engine.c
@@ -34,19 +34,13 @@
 #include "DNA_screen_types.h"
 #include "DNA_view3d_types.h"
 
-#include "BKE_icons.h"
-#include "BKE_idprop.h"
-#include "BKE_main.h"
 
-#include "ED_view3d.h"
 #include "ED_screen.h"
 
-#include "GPU_glew.h"
 #include "GPU_matrix.h"
 #include "GPU_shader.h"
 #include "GPU_viewport.h"
 
-#include "external_engine.h"
 /* Shaders */
 
 #define EXTERNAL_ENGINE "BLENDER_EXTERNAL"
diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c b/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
index 42a46d396a2..a9f8c23c236 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
@@ -35,14 +35,11 @@
 #include "DNA_screen_types.h"
 #include "DNA_view3d_types.h"
 
-#include "BKE_action.h"
 #include "BKE_deform.h"
 #include "BKE_gpencil.h"
 
 #include "DRW_render.h"
 
-#include "GPU_immediate.h"
-#include "GPU_draw.h"
 
 #include "ED_gpencil.h"
 #include "ED_view3d.h"
diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
index 88ced6a0ac4..35515db9cc0 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
@@ -28,10 +28,8 @@
 
 #include "BLI_polyfill_2d.h"
 
-#include "DRW_engine.h"
 #include "DRW_render.h"
 
-#include "BKE_brush.h"
 #include "BKE_gpencil.h"
 #include "BKE_gpencil_modifier.h"
 #include "BKE_image.h"
@@ -39,7 +37,6 @@
 #include "BKE_paint.h"
 
 #include "ED_gpencil.h"
-#include "ED_view3d.h"
 
 #include "DNA_gpencil_types.h"
 #include "DNA_material_types.h"
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c
index 25cfaf1e3c6..708076b3387 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@ -28,10 +28,7 @@
 #include "DRW_engine.h"
 #include "DRW_render.h"
 
-#include "BKE_camera.h"
 #include "BKE_object.h"
-#include "BKE_paint.h"
-#include "BKE_gpencil.h"
 #include "BKE_shader_fx.h"
 
 #include "DNA_gpencil_types.h"
@@ -39,7 +36,6 @@
 
 #include "draw_mode_engines.h"
 
-#include "UI_resources.h"
 
 #include "GPU_texture.h"
 
@@ -48,9 +44,7 @@
 #include "DEG_depsgraph_query.h"
 
 #include "ED_screen.h"
-#include "ED_gpencil.h"
 
-#include "WM_api.h"
 
 extern char datatoc_gpencil_fill_vert_glsl[];
 extern char datatoc_gpencil_fill_frag_glsl[];
diff --git a/source/blender/draw/engines/gpencil/gpencil_render.c b/source/blender/draw/engines/gpencil/gpencil_render.c
index e58283e8d7f..e2dea692852 100644
--- a/source/blender/draw/engines/gpencil/gpencil_render.c
+++ b/source/blender/draw/engines/gpencil/gpencil_render.c
@@ -27,10 +27,8 @@
  */
 #include "BLI_rect.h"
 
-#include "DRW_engine.h"
 #include "DRW_render.h"
 
-#include "BKE_camera.h"
 #include "BKE_object.h"
 
 #include "DNA_gpencil_types.h"
diff --git a/source/blender/draw/engines/gpencil/gpencil_shader_fx.c b/source/blender/draw/engines/gpencil/gpencil_shader_fx.c
index 1f47be0c34a..bbf2f8c1142 100644
--- a/source/blender/draw/engines/gpencil/gpencil_shader_fx.c
+++ b/source/blender/draw/engines/gpencil/gpencil_shader_fx.c
@@ -27,21 +27,15 @@
  */
 #include "DNA_gpencil_types.h"
 #include "DNA_shader_fx_types.h"
-#include "DNA_screen_types.h"
 #include "DNA_view3d_types.h"
 #include "DNA_camera_types.h"
 
 #include "BKE_gpencil.h"
-#include "BKE_shader_fx.h"
 
-#include "DRW_engine.h"
 #include "DRW_render.h"
 
 #include "BKE_camera.h"
 
-#include "ED_view3d.h"
-#include "ED_gpencil.h"
-
 #include "gpencil_engine.h"
 
 extern char datatoc_gpencil_fx_blur_frag_glsl[];
diff --git a/source/blender/draw/engines/workbench/workbench_deferred.c b/source/blender/draw/engines/workbench/workbench_deferred.c
index 0a17907a12d..e6771ddc562 100644
--- a/source/blender/draw/engines/workbench/workbench_deferred.c
+++ b/source/blender/draw/engines/workbench/workbench_deferred.c
@@ -28,7 +28,6 @@
 
 #include "workbench_private.h"
 
-#include "BIF_gl.h"
 
 #include "BLI_alloca.h"
 #include "BLI_dynstr.h"
@@ -36,7 +35,6 @@
 #include "BLI_rand.h"
 #include "BLI_string_utils.h"
 
-#include "BKE_node.h"
 #include "BKE_modifier.h"
 #include "BKE_object.h"
 #include "BKE_particle.h"
@@ -46,7 +44,6 @@
 #include "DNA_modifier_types.h"
 #include "DNA_node_types.h"
 
-#include "ED_uvedit.h"
 
 #include "GPU_shader.h"
 #include "GPU_texture.h"
diff --git a/source/blender/draw/engines/workbench/workbench_forward.c b/source/blender/draw/engines/workbench/workbench_forward.c
index b353f96d18d..1a8db642c10 100644
--- a/source/blender/draw/engines/workbench/workbench_forward.c
+++ b/source/blender/draw/engines/workbench/workbench_forward.c
@@ -35,7 +35,6 @@
 #include "BLI_string_utils.h"
 #include "BLI_utildefines.h"
 
-#include "BKE_node.h"
 #include "BKE_particle.h"
 #include "BKE_modifier.h"
 #include "BKE_object.h"
@@ -45,12 +44,10 @@
 #include "DNA_modifier_types.h"
 #include "DNA_node_types.h"
 
-#include "ED_uvedit.h"
 
 #include "GPU_shader.h"
 #include "GPU_texture.h"
 
-#include "UI_resources.h"
 
 /* *********** STATIC *********** */
 static struct {
diff --git a/source/blender/draw/engines/workbench/workbench_studiolight.c b/source/blender/draw/engines/workbench/workbench_studiolight.c
index ac0539b91f4..683e9b353c0 100644
--- a/source/blender/draw/engines/workbench/workbench_studiolight.c
+++ b/source/blender/draw/engines/workbench/workbench_studiolight.c
@@ -27,13 +27,11 @@
  */
 #include "BKE_studiolight.h"
 
-#include "DRW_engine.h"
 #include "workbench_private.h"
 
 #include "BKE_object.h"
 
 #include "BLI_math.h"
-#include "BKE_global.h"
 
 void studiolight_update_world(WORKBENCH_PrivateData *wpd, StudioLight *studiolight, WORKBENCH_UBO_World *wd)
 {
diff --git a/source/blender/draw/engines/workbench/workbench_volume.c b/source/blender/draw/engines/workbench/workbench_volume.c
index 6b59c3c8c7f..3d35ad22074 100644
--- a/source/blender/draw/engines/workbench/workbench_volume.c
+++ b/source/blender/draw/engines/workbench/workbench_volume.c
@@ -28,7 +28,6 @@
 
 #include "workbench_private.h"
 
-#include "BKE_modifier.h"
 #include "BKE_object.h"
 
 #include "BLI_rand.h"
-- 
cgit v1.2.3