Cleanup: draw manager headers
authorCampbell Barton <ideasman42@gmail.com>
Sat, 26 Jan 2019 09:07:31 +0000 (20:07 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 26 Jan 2019 09:08:52 +0000 (20:08 +1100)
52 files changed:
source/blender/draw/engines/basic/basic_engine.c
source/blender/draw/engines/eevee/eevee_bloom.c
source/blender/draw/engines/eevee/eevee_depth_of_field.c
source/blender/draw/engines/eevee/eevee_effects.c
source/blender/draw/engines/eevee/eevee_engine.c
source/blender/draw/engines/eevee/eevee_lightcache.c
source/blender/draw/engines/eevee/eevee_lightprobes.c
source/blender/draw/engines/eevee/eevee_lights.c
source/blender/draw/engines/eevee/eevee_materials.c
source/blender/draw/engines/eevee/eevee_motion_blur.c
source/blender/draw/engines/eevee/eevee_occlusion.c
source/blender/draw/engines/eevee/eevee_render.c
source/blender/draw/engines/eevee/eevee_temporal_sampling.c
source/blender/draw/engines/eevee/eevee_volumes.c
source/blender/draw/engines/external/external_engine.c
source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
source/blender/draw/engines/gpencil/gpencil_draw_utils.c
source/blender/draw/engines/gpencil/gpencil_engine.c
source/blender/draw/engines/gpencil/gpencil_render.c
source/blender/draw/engines/gpencil/gpencil_shader_fx.c
source/blender/draw/engines/workbench/workbench_deferred.c
source/blender/draw/engines/workbench/workbench_forward.c
source/blender/draw/engines/workbench/workbench_studiolight.c
source/blender/draw/engines/workbench/workbench_volume.c
source/blender/draw/intern/draw_anim_viz.c
source/blender/draw/intern/draw_armature.c
source/blender/draw/intern/draw_cache.c
source/blender/draw/intern/draw_cache_impl_displist.c
source/blender/draw/intern/draw_cache_impl_mesh.c
source/blender/draw/intern/draw_cache_impl_metaball.c
source/blender/draw/intern/draw_cache_impl_particles.c
source/blender/draw/intern/draw_hair.c
source/blender/draw/intern/draw_manager.c
source/blender/draw/intern/draw_manager_exec.c
source/blender/draw/intern/draw_manager_profiling.c
source/blender/draw/intern/draw_manager_shader.c
source/blender/draw/intern/draw_manager_text.c
source/blender/draw/intern/draw_view.c
source/blender/draw/modes/edit_armature_mode.c
source/blender/draw/modes/edit_curve_mode.c
source/blender/draw/modes/edit_lattice_mode.c
source/blender/draw/modes/edit_mesh_mode_text.c
source/blender/draw/modes/edit_metaball_mode.c
source/blender/draw/modes/edit_text_mode.c
source/blender/draw/modes/object_mode.c
source/blender/draw/modes/overlay_mode.c
source/blender/draw/modes/paint_texture_mode.c
source/blender/draw/modes/paint_vertex_mode.c
source/blender/draw/modes/paint_weight_mode.c
source/blender/draw/modes/particle_mode.c
source/blender/draw/modes/pose_mode.c
source/blender/draw/modes/sculpt_mode.c

index 7f4da54e63d2431f0815b800d818a8ed9c2ab428..f6a6d89cc402d375972e78fee1a812adc46fccfb 100644 (file)
@@ -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"
index 14adc43e84d7c4e2a775aafc35a53f89b64e4495..3402a7c1cabd093118143e8f4c3471f3c144f13a 100644 (file)
 
 #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"
index 7c66a32f5fa2e092e04b8048818f44c6de2d3bbc..79ecc6703d6cfb90ebc2683b02a779a1b9fa8fb3 100644 (file)
 
 #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];
index 09f88fb3ee83e826f9891e270384b7eba01b0054..96890c6ada7f02bbf19744627afd15eb48747ae6 100644 (file)
@@ -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"
index 7f6f485644cbd6cee4470098fa6140482d81fd90..7fc15342c7c76547633a3a103a44975a4d126a1d 100644 (file)
 
 #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"
index 0420e85ee706bc98da43af1d6879ded1fbbd93e4..410ea18d876c282381ea591f89d84a8546e83c16 100644 (file)
@@ -31,7 +31,6 @@
 #include "DRW_render.h"
 
 #include "BKE_global.h"
-#include "BKE_blender.h"
 
 #include "BLI_threads.h"
 
index 601073a7be2ab613b678fcf156806988f50bf60d..d278d6bb54bd5c2df6a9d29fa50ba247041c3e3b 100644 (file)
@@ -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"
 
 #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"
index 57a93a27ca00a6dfa9f703696eefbcdaa810f737..a95edfb1884d4458893bb392e7d2fd721f1ac9ce 100644 (file)
@@ -36,7 +36,6 @@
 
 #include "DEG_depsgraph_query.h"
 
-#include "eevee_engine.h"
 #include "eevee_private.h"
 
 #define SHADOW_CASTER_ALLOC_CHUNK 16
index 527fa515deb006327540d3750b9a35f495475b3d..f4c3bb6ca857c0c06f069c64093f283b7ecc8a8a 100644 (file)
@@ -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"
index 369a77d0421ebd562d07ddbf0d1f487dcd7443c7..33e11c3017bfa3add6ddc181e50425bd7997ea67 100644 (file)
 
 #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"
index 8c76f3a500b2d14b4f1e6cd08384189250d400b9..676d941b6d1ab0bd89d2bf1fa37910eabd67531d 100644 (file)
@@ -32,7 +32,6 @@
 
 #include "BLI_string_utils.h"
 
-#include "DNA_anim_types.h"
 
 #include "DEG_depsgraph_query.h"
 
index 6e2cac6dbce587c75fa70765e6ede99829334f7f..ac6f0720d7d7fc889a023e6b47a8c69d38e7b6a8 100644 (file)
@@ -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"
index 480ff87a5eb8922f39789c5ea771411e6542cbd9..aa86b6191855e77324ed2c9e02bb6be4b74b687e 100644 (file)
@@ -33,7 +33,6 @@
 #include "ED_screen.h"
 
 #include "BLI_rand.h"
-#include "BLI_string_utils.h"
 
 #include "DEG_depsgraph_query.h"
 
index 58e932f6e5c762d0102182b0f13f4dcd59a8cefb..0601fd4a7f9e06cdb34a7e45e9f0a2527c241295 100644 (file)
 #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"
 
index 26586aef84dbe1be628ddfd396a62e972310b303..fee0dda5f219485667a883588a838e2bcb3bdec9 100644 (file)
 #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"
index 42a46d396a2381bea3ddc35775b5d2a13200af09..a9f8c23c236e96665c3227034e63d61906f6364a 100644 (file)
 #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"
index 88ced6a0ac42605f9edfce315452a67992c20b46..35515db9cc0c43c8ae3be8eefc9c6f3137dbc435 100644 (file)
 
 #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"
index 25cfaf1e3c6086e0ad2134c14e08e02bcd3ca601..708076b338744af69d81e14e1bddb4b4d04c9b4c 100644 (file)
 #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[];
index e58283e8d7fba72d245acce223715dac536d2711..e2dea692852513fbc05085eaa9e7381fea7df7bf 100644 (file)
  */
 #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"
index 1f47be0c34abb5a0966e3e499a6d56d08b74c415..bbf2f8c11425ca056964a8a1cae1db4900a8b77f 100644 (file)
  */
 #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[];
index 0a17907a12df1d1c002f18dd6d8f8b468a055f46..e6771ddc5621af51e6153af2162570834e9170db 100644 (file)
@@ -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"
index b353f96d18dd6ef2361314e650057b91d0fa0df1..1a8db642c10e2668adf305e393635d23ce87766d 100644 (file)
@@ -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"
 #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 {
index ac0539b91f4c8cd27d077aca136916e3fc7dc2f6..683e9b353c00f9083561980265b120b497c109fd 100644 (file)
  */
 #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)
 {
index 6b59c3c8c7ff5fe2378f2b20e47c16a216718f8f..3d35ad22074cb36f98e0a0f51cd575e9ac7eb354 100644 (file)
@@ -28,7 +28,6 @@
 
 #include "workbench_private.h"
 
-#include "BKE_modifier.h"
 #include "BKE_object.h"
 
 #include "BLI_rand.h"
index 60dfea7be7de9608b7bc179311bdc5ac2d2bca9d..c35dab2f2e7d0d4edf15731026dfe486a8bf84e3 100644 (file)
 
 #include "BLI_sys_types.h"
 
-#include "DNA_anim_types.h"
 #include "DNA_armature_types.h"
 #include "DNA_scene_types.h"
-#include "DNA_screen_types.h"
 #include "DNA_view3d_types.h"
 #include "DNA_object_types.h"
 
 #include "BLI_math.h"
-#include "BLI_dlrbTree.h"
 
-#include "BKE_animsys.h"
-#include "BKE_action.h"
 
-#include "ED_keyframes_draw.h"
 
 #include "UI_resources.h"
 
 
 #include "GPU_shader.h"
 #include "GPU_immediate.h"
-#include "GPU_matrix.h"
 
 #include "draw_common.h"
 #include "draw_manager_text.h"
 
-#include "draw_mode_engines.h"
 
 /* ********************************* Lists ************************************** */
 /* All lists are per viewport specific datas.
index 08abf85912b65e6e28008d0835d0caef80add43f..a24476cf8def36ee924851cbee95c2a41f34c422 100644 (file)
 #include <string.h>
 #include <math.h>
 
-#include "DNA_anim_types.h"
 #include "DNA_armature_types.h"
 #include "DNA_constraint_types.h"
 #include "DNA_scene_types.h"
-#include "DNA_screen_types.h"
 #include "DNA_view3d_types.h"
 #include "DNA_object_types.h"
 
 #include "DRW_render.h"
 
-#include "BLI_blenlib.h"
 #include "BLI_math.h"
-#include "BLI_dlrbTree.h"
 #include "BLI_utildefines.h"
 
-#include "BKE_animsys.h"
-#include "BKE_action.h"
 #include "BKE_armature.h"
-#include "BKE_global.h"
-#include "BKE_modifier.h"
-#include "BKE_nla.h"
-#include "BKE_curve.h"
 
-#include "BIF_gl.h"
 
 #include "ED_armature.h"
-#include "ED_keyframes_draw.h"
 
-#include "GPU_select.h"
 
 #include "UI_resources.h"
 
index 2bc73700462cd65d7001ad2111b71474da1d46e0..500aadd20241307a2eda04602e0ae08d380e1fcb 100644 (file)
 
 #include "BLI_utildefines.h"
 #include "BLI_math.h"
-#include "BLI_listbase.h"
 
 #include "BKE_object.h"
 #include "BKE_paint.h"
-#include "BKE_object_deform.h"
 
 #include "GPU_batch.h"
-#include "GPU_batch_presets.h"
 #include "GPU_batch_utils.h"
 
 #include "MEM_guardedalloc.h"
index 6bd698a9cec4582041963086e533e24f310c85d6..1c6b8eccce69ee3e39df617b1a81d54ff9a527c6 100644 (file)
@@ -29,7 +29,6 @@
  * \note DispList may be removed soon! This is a utility for object types that use render.
  */
 
-#include "MEM_guardedalloc.h"
 
 #include "BLI_alloca.h"
 #include "BLI_utildefines.h"
index af2539188ecf29ecf37c9fdb397eeaa150434562..bc34bfe0cbefd98a9e9b57c34400d14ead96d877 100644 (file)
@@ -35,7 +35,6 @@
 #include "BLI_utildefines.h"
 #include "BLI_math_vector.h"
 #include "BLI_math_bits.h"
-#include "BLI_math_color.h"
 #include "BLI_string.h"
 #include "BLI_alloca.h"
 #include "BLI_edgehash.h"
@@ -43,7 +42,6 @@
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
-#include "DNA_space_types.h"
 #include "DNA_scene_types.h"
 
 #include "BKE_customdata.h"
 #include "BKE_mesh.h"
 #include "BKE_mesh_tangent.h"
 #include "BKE_mesh_runtime.h"
-#include "BKE_object.h"
 #include "BKE_object_deform.h"
-#include "BKE_colorband.h"
-#include "BKE_cdderivedmesh.h"
 
-#include "DEG_depsgraph_query.h"
 
 #include "bmesh.h"
 
 #include "GPU_batch.h"
-#include "GPU_batch_presets.h"
-#include "GPU_draw.h"
 #include "GPU_material.h"
 
 #include "DRW_render.h"
 
-#include "ED_image.h"
 #include "ED_mesh.h"
 #include "ED_uvedit.h"
 
index b77268fb0a745d1cb01ef2ed50e448344fc73c2c..6002e6aaa625385f48ccd930291c8b185d7b4fa9 100644 (file)
@@ -39,7 +39,6 @@
 
 #include "GPU_batch.h"
 
-#include "DRW_render.h"
 
 #include "draw_cache_impl.h"  /* own include */
 
index ef44d69424bc7ccc02771c0464e38be728812108..4a23bee8d50023afa57998f9bf13a6fc03b9e3ac 100644 (file)
@@ -44,9 +44,7 @@
 #include "DNA_particle_types.h"
 #include "DNA_customdata_types.h"
 
-#include "BKE_lattice.h"
 #include "BKE_mesh.h"
-#include "BKE_modifier.h"
 #include "BKE_particle.h"
 #include "BKE_pointcache.h"
 
index 7c83f28f995be0e89e1713ea6715147fc5435c89..af49f94b98dd7fc451be7865cad495d8255647d7 100644 (file)
 #include "BLI_utildefines.h"
 #include "BLI_string_utils.h"
 
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_modifier_types.h"
 #include "DNA_particle_types.h"
 #include "DNA_customdata_types.h"
 
 #include "BKE_anim.h"
-#include "BKE_mesh.h"
-#include "BKE_particle.h"
-#include "BKE_pointcache.h"
 
-#include "ED_particle.h"
 
 #include "GPU_batch.h"
 #include "GPU_shader.h"
index ad045e9ea1f81477f6da72bc99a8b9a1316512ea..329fe133ad7a76bd97c87f7d1fe825fbf338399b 100644 (file)
 
 #include "BKE_colortools.h"
 #include "BKE_global.h"
-#include "BKE_mesh.h"
 #include "BKE_object.h"
 #include "BKE_particle.h"
 #include "BKE_pointcache.h"
-#include "BKE_workspace.h"
 
 #include "draw_manager.h"
 #include "DNA_camera_types.h"
@@ -53,7 +51,6 @@
 #include "ED_space_api.h"
 #include "ED_screen.h"
 #include "ED_gpencil.h"
-#include "ED_particle.h"
 #include "ED_view3d.h"
 
 #include "GPU_draw.h"
@@ -69,7 +66,6 @@
 #include "RE_engine.h"
 #include "RE_pipeline.h"
 
-#include "UI_interface.h"
 #include "UI_resources.h"
 
 #include "WM_api.h"
index 787f4ee7b401f63d4fcac25e23181527d766f643..91221d6327044197732ab1779299512390f2b111 100644 (file)
 
 #include "BLI_mempool.h"
 
-#include "BIF_glutil.h"
 
 #include "BKE_global.h"
-#include "BKE_object.h"
 
 #include "GPU_draw.h"
 #include "GPU_extensions.h"
 #include "intern/gpu_shader_private.h"
 
 #ifdef USE_GPU_SELECT
-#  include "ED_view3d.h"
-#  include "ED_armature.h"
 #  include "GPU_select.h"
 #endif
 
index b2641d9fd6217cdd70cca094cada288d6caaa5e8..789b974b80b3eb290ad0ffd404c024c18fb55204 100644 (file)
 
 #include "draw_manager.h"
 
-#include "GPU_glew.h"
 #include "GPU_texture.h"
 
 #include "UI_resources.h"
 
-#include "WM_api.h"
-#include "WM_types.h"
 
 #include "draw_manager_profiling.h"
 
index 218ed3f59c4aa040550b4d548e5c3dd527f343ea..d460d67104314c2b89cb0720e001a79e80a57b79 100644 (file)
 #include "DNA_material_types.h"
 
 #include "BLI_listbase.h"
-#include "BLI_string.h"
 #include "BLI_string_utils.h"
 #include "BLI_threads.h"
-#include "BLI_task.h"
 
 #include "BKE_global.h"
 #include "BKE_main.h"
index d92d3d7a64a273723ca630e632b1d269c0c59121..0a0a2a125e245a5c54702737c59288afb531f741 100644 (file)
 #include "MEM_guardedalloc.h"
 
 #include "BLI_listbase.h"
-#include "BLI_string.h"
 #include "BLI_math.h"
 
-#include "BIF_gl.h"
 
 #include "GPU_matrix.h"
 
 #include "ED_screen.h"
 #include "ED_view3d.h"
 
-#include "UI_resources.h"
 #include "UI_interface.h"
 
 #include "WM_api.h"
index 027eda05933b0af0f4a7d6ebd098f238aa113a7d..9a664be8e840f5c0c1ff0d9b82c269c0b3ea5864 100644 (file)
 #include "DNA_brush_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_userdef_types.h"
-#include "DNA_world_types.h"
 #include "DNA_view3d_types.h"
 
 #include "ED_screen.h"
-#include "ED_transform.h"
 #include "ED_view3d.h"
 
-#include "GPU_draw.h"
 #include "GPU_shader.h"
 #include "GPU_immediate.h"
 #include "GPU_matrix.h"
 
 #include "UI_resources.h"
 
-#include "WM_api.h"
 #include "WM_types.h"
 
-#include "BKE_global.h"
 #include "BKE_object.h"
 #include "BKE_paint.h"
-#include "BKE_unit.h"
 
 #include "DRW_render.h"
 
index d483d19569b3bd831f334671b7aa82394b623e5a..cb23123fde265f32759375ae131a0a2ee3b15220 100644 (file)
 
 #include "draw_common.h"
 
-#include "draw_mode_engines.h"
-
-
-
 /* *********** LISTS *********** */
 typedef struct EDIT_ARMATURE_PassList {
        struct DRWPass *bone_solid[2];
index 5ba9c6bf173f1850fdd279d78d85890244c4afa0..eb450c287a67f23a519ef215b074dc35c279bfa3 100644 (file)
 
 /* If builtin shaders are needed */
 #include "GPU_shader.h"
-#include "GPU_batch.h"
 
 #include "draw_common.h"
 
-#include "draw_mode_engines.h"
 
 /* If needed, contains all global/Theme colors
  * Add needed theme colors / values to DRW_globals_update() and update UBO
index e484b359b9e71f784aeb4a46697e877145ba5cf2..938f8b36e5d0ae1e0b4d632e94e01701f8336484 100644 (file)
@@ -36,7 +36,6 @@
 
 #include "draw_common.h"
 
-#include "draw_mode_engines.h"
 #include "draw_builtin_shader.h"
 
 extern char datatoc_common_world_clip_lib_glsl[];
index 6c78473be34ea8453485755d3c9db8b1f0275790..ceccbbd6965276ec918dff250dcd44652d0adf4d 100644 (file)
@@ -35,9 +35,6 @@
 
 #include "ED_view3d.h"
 
-#include "GPU_shader.h"
-#include "GPU_viewport.h"
-
 #include "DNA_mesh_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
index 6541d71d5e8f12a9be57e4984457415d73c3917a..4b5fe2788e8b7ae0b7248db8cf393b9b24950a4d 100644 (file)
  *  \ingroup draw
  */
 
-#include "DRW_engine.h"
 #include "DRW_render.h"
 
 #include "DNA_meta_types.h"
 
 #include "BKE_object.h"
-#include "BKE_mball.h"
 
 #include "ED_mball.h"
 
 /* If builtin shaders are needed */
 #include "GPU_shader.h"
-#include "GPU_select.h"
 
 #include "draw_common.h"
 
-#include "draw_mode_engines.h"
 
 /* *********** LISTS *********** */
 /* All lists are per viewport specific datas.
index f287f7b1018bdb0772bfda342f46db98fb5c04f7..ca533a00737272dd54b3e8b12d63aa01ae2f4651 100644 (file)
 
 /* If builtin shaders are needed */
 #include "GPU_shader.h"
-#include "GPU_batch.h"
 
 #include "draw_common.h"
 
-#include "draw_mode_engines.h"
-
 /* *********** LISTS *********** */
 /* All lists are per viewport specific datas.
  * They are all free when viewport changes engines
index 719e781f291b0ce9c1596349483d73bbc2357b24..255c8fc937fa8606899ad814b142be3b85414541 100644 (file)
 #include "DNA_view3d_types.h"
 #include "DNA_world_types.h"
 
-#include "BIF_gl.h"
 
-#include "BLI_string_utils.h"
 
 #include "BKE_anim.h"
 #include "BKE_camera.h"
 #include "BKE_constraint.h"
 #include "BKE_curve.h"
 #include "BKE_editmesh.h"
-#include "BKE_global.h"
 #include "BKE_mball.h"
 #include "BKE_mesh.h"
 #include "BKE_modifier.h"
 #include "BKE_movieclip.h"
 #include "BKE_object.h"
 #include "BKE_particle.h"
-#include "BKE_image.h"
-#include "BKE_texture.h"
 #include "BKE_tracking.h"
 
 #include "ED_view3d.h"
index 1888bd8524664afa07099f5029e0711302e2b9f3..dc8ea53be2a1eccee002cbb3f941785ccf1fff3a 100644 (file)
 #include "BKE_global.h"
 
 #include "GPU_shader.h"
-#include "GPU_extensions.h"
 #include "DRW_render.h"
 
-#include "draw_mode_engines.h"
 
 /* Structures */
 typedef struct OVERLAY_StorageList {
index 094e4bdced40eefb92ea0fd3795ba87da6190ca4..5b8b597c34931e7a369ed2b18a1842d4ba3d53cd 100644 (file)
@@ -39,7 +39,6 @@
 
 #include "draw_common.h"
 
-#include "draw_mode_engines.h"
 
 #include "DNA_mesh_types.h"
 
index d63f6216e926284fa13e778712843737aa9e4cdb..b7581cf13f2ecab6c3f5efeb43739426664d9993 100644 (file)
@@ -26,7 +26,6 @@
  *  \ingroup draw
  */
 
-#include "DRW_engine.h"
 #include "DRW_render.h"
 
 /* If builtin shaders are needed */
@@ -34,7 +33,6 @@
 
 #include "draw_common.h"
 
-#include "draw_mode_engines.h"
 
 #include "DNA_mesh_types.h"
 #include "DNA_view3d_types.h"
index 7d4b3cac41ba3f534ea7d98eaefe4ff4d4b426b2..14b9a27928cf84f384adf57e2e62404b3b54023a 100644 (file)
@@ -26,7 +26,6 @@
  *  \ingroup draw
  */
 
-#include "DRW_engine.h"
 #include "DRW_render.h"
 
 /* If builtin shaders are needed */
 
 #include "draw_common.h"
 
-#include "draw_mode_engines.h"
-
 #include "DNA_mesh_types.h"
 #include "DNA_view3d_types.h"
 
-#include "BKE_mesh.h"
-
 #include "DEG_depsgraph_query.h"
 
 extern char datatoc_common_world_clip_lib_glsl[];
index 3827dba8ac186ec4fa61048792a732add0995c34..eb3f73235e47dbed3648348a809eb97ed511354e 100644 (file)
  *  \ingroup draw
  */
 
-#include "DRW_engine.h"
 #include "DRW_render.h"
 
-#include "DNA_mesh_types.h"
 #include "DNA_object_types.h"
 #include "DNA_particle_types.h"
 
-#include "BKE_particle.h"
 #include "BKE_pointcache.h"
 
 #include "GPU_shader.h"
-#include "GPU_batch.h"
 
 #include "draw_common.h"
 
-#include "draw_mode_engines.h"
-
 #include "ED_particle.h"
 
 #include "DEG_depsgraph_query.h"
 
-#include "draw_cache_impl.h"
-
 extern char datatoc_particle_strand_vert_glsl[];
 extern char datatoc_particle_strand_frag_glsl[];
 extern char datatoc_common_globals_lib_glsl[];
index 37a61692a37097bf33e77c8e4af12452298d0a68..bf95f0e38e91f3cd2c34f83a4e32326f7e4da684 100644 (file)
@@ -38,9 +38,6 @@
 
 #include "draw_common.h"
 
-#include "draw_mode_engines.h"
-
-
 /* *********** LISTS *********** */
 /* All lists are per viewport specific datas.
  * They are all free when viewport changes engines
index c38bd8faddd812b10eb175130578cfc03297543c..94ad86d70c07dd054824ae715dded46fdc35963d 100644 (file)
 #include "BKE_pbvh.h"
 #include "BKE_paint.h"
 
-#include "DEG_depsgraph.h"
-
 /* If builtin shaders are needed */
 #include "GPU_shader.h"
-#include "GPU_matrix.h"
 
 #include "draw_common.h"
 
-#include "draw_mode_engines.h"
-
 extern char datatoc_sculpt_mask_vert_glsl[];
 extern char datatoc_gpu_shader_flat_color_frag_glsl[];
 extern char datatoc_gpu_shader_3D_smooth_color_frag_glsl[];