diff options
52 files changed, 0 insertions, 191 deletions
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" diff --git a/source/blender/draw/intern/draw_anim_viz.c b/source/blender/draw/intern/draw_anim_viz.c index 60dfea7be7d..c35dab2f2e7 100644 --- a/source/blender/draw/intern/draw_anim_viz.c +++ b/source/blender/draw/intern/draw_anim_viz.c @@ -33,20 +33,14 @@ #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" @@ -57,12 +51,10 @@ #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. diff --git a/source/blender/draw/intern/draw_armature.c b/source/blender/draw/intern/draw_armature.c index 08abf85912b..a24476cf8de 100644 --- a/source/blender/draw/intern/draw_armature.c +++ b/source/blender/draw/intern/draw_armature.c @@ -30,35 +30,22 @@ #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" diff --git a/source/blender/draw/intern/draw_cache.c b/source/blender/draw/intern/draw_cache.c index 2bc73700462..500aadd2024 100644 --- a/source/blender/draw/intern/draw_cache.c +++ b/source/blender/draw/intern/draw_cache.c @@ -39,14 +39,11 @@ #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" diff --git a/source/blender/draw/intern/draw_cache_impl_displist.c b/source/blender/draw/intern/draw_cache_impl_displist.c index 6bd698a9cec..1c6b8eccce6 100644 --- a/source/blender/draw/intern/draw_cache_impl_displist.c +++ b/source/blender/draw/intern/draw_cache_impl_displist.c @@ -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" diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.c b/source/blender/draw/intern/draw_cache_impl_mesh.c index af2539188ec..bc34bfe0cbe 100644 --- a/source/blender/draw/intern/draw_cache_impl_mesh.c +++ b/source/blender/draw/intern/draw_cache_impl_mesh.c @@ -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" @@ -54,23 +52,16 @@ #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" diff --git a/source/blender/draw/intern/draw_cache_impl_metaball.c b/source/blender/draw/intern/draw_cache_impl_metaball.c index b77268fb0a7..6002e6aaa62 100644 --- a/source/blender/draw/intern/draw_cache_impl_metaball.c +++ b/source/blender/draw/intern/draw_cache_impl_metaball.c @@ -39,7 +39,6 @@ #include "GPU_batch.h" -#include "DRW_render.h" #include "draw_cache_impl.h" /* own include */ diff --git a/source/blender/draw/intern/draw_cache_impl_particles.c b/source/blender/draw/intern/draw_cache_impl_particles.c index ef44d69424b..4a23bee8d50 100644 --- a/source/blender/draw/intern/draw_cache_impl_particles.c +++ b/source/blender/draw/intern/draw_cache_impl_particles.c @@ -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" diff --git a/source/blender/draw/intern/draw_hair.c b/source/blender/draw/intern/draw_hair.c index 7c83f28f995..af49f94b98d 100644 --- a/source/blender/draw/intern/draw_hair.c +++ b/source/blender/draw/intern/draw_hair.c @@ -34,18 +34,12 @@ #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" diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index ad045e9ea1f..329fe133ad7 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -38,11 +38,9 @@ #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" diff --git a/source/blender/draw/intern/draw_manager_exec.c b/source/blender/draw/intern/draw_manager_exec.c index 787f4ee7b40..91221d63270 100644 --- a/source/blender/draw/intern/draw_manager_exec.c +++ b/source/blender/draw/intern/draw_manager_exec.c @@ -30,18 +30,14 @@ #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 diff --git a/source/blender/draw/intern/draw_manager_profiling.c b/source/blender/draw/intern/draw_manager_profiling.c index b2641d9fd62..789b974b80b 100644 --- a/source/blender/draw/intern/draw_manager_profiling.c +++ b/source/blender/draw/intern/draw_manager_profiling.c @@ -37,13 +37,10 @@ #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" diff --git a/source/blender/draw/intern/draw_manager_shader.c b/source/blender/draw/intern/draw_manager_shader.c index 218ed3f59c4..d460d671043 100644 --- a/source/blender/draw/intern/draw_manager_shader.c +++ b/source/blender/draw/intern/draw_manager_shader.c @@ -31,10 +31,8 @@ #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" diff --git a/source/blender/draw/intern/draw_manager_text.c b/source/blender/draw/intern/draw_manager_text.c index d92d3d7a64a..0a0a2a125e2 100644 --- a/source/blender/draw/intern/draw_manager_text.c +++ b/source/blender/draw/intern/draw_manager_text.c @@ -28,17 +28,14 @@ #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" diff --git a/source/blender/draw/intern/draw_view.c b/source/blender/draw/intern/draw_view.c index 027eda05933..9a664be8e84 100644 --- a/source/blender/draw/intern/draw_view.c +++ b/source/blender/draw/intern/draw_view.c @@ -31,27 +31,21 @@ #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" diff --git a/source/blender/draw/modes/edit_armature_mode.c b/source/blender/draw/modes/edit_armature_mode.c index d483d19569b..cb23123fde2 100644 --- a/source/blender/draw/modes/edit_armature_mode.c +++ b/source/blender/draw/modes/edit_armature_mode.c @@ -34,10 +34,6 @@ #include "draw_common.h" -#include "draw_mode_engines.h" - - - /* *********** LISTS *********** */ typedef struct EDIT_ARMATURE_PassList { struct DRWPass *bone_solid[2]; diff --git a/source/blender/draw/modes/edit_curve_mode.c b/source/blender/draw/modes/edit_curve_mode.c index 5ba9c6bf173..eb450c287a6 100644 --- a/source/blender/draw/modes/edit_curve_mode.c +++ b/source/blender/draw/modes/edit_curve_mode.c @@ -36,11 +36,9 @@ /* 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 diff --git a/source/blender/draw/modes/edit_lattice_mode.c b/source/blender/draw/modes/edit_lattice_mode.c index e484b359b9e..938f8b36e5d 100644 --- a/source/blender/draw/modes/edit_lattice_mode.c +++ b/source/blender/draw/modes/edit_lattice_mode.c @@ -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[]; diff --git a/source/blender/draw/modes/edit_mesh_mode_text.c b/source/blender/draw/modes/edit_mesh_mode_text.c index 6c78473be34..ceccbbd6965 100644 --- a/source/blender/draw/modes/edit_mesh_mode_text.c +++ b/source/blender/draw/modes/edit_mesh_mode_text.c @@ -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" diff --git a/source/blender/draw/modes/edit_metaball_mode.c b/source/blender/draw/modes/edit_metaball_mode.c index 6541d71d5e8..4b5fe2788e8 100644 --- a/source/blender/draw/modes/edit_metaball_mode.c +++ b/source/blender/draw/modes/edit_metaball_mode.c @@ -26,23 +26,19 @@ * \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. diff --git a/source/blender/draw/modes/edit_text_mode.c b/source/blender/draw/modes/edit_text_mode.c index f287f7b1018..ca533a00737 100644 --- a/source/blender/draw/modes/edit_text_mode.c +++ b/source/blender/draw/modes/edit_text_mode.c @@ -37,12 +37,9 @@ /* 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 diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c index 719e781f291..255c8fc937f 100644 --- a/source/blender/draw/modes/object_mode.c +++ b/source/blender/draw/modes/object_mode.c @@ -45,24 +45,19 @@ #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" diff --git a/source/blender/draw/modes/overlay_mode.c b/source/blender/draw/modes/overlay_mode.c index 1888bd85246..dc8ea53be2a 100644 --- a/source/blender/draw/modes/overlay_mode.c +++ b/source/blender/draw/modes/overlay_mode.c @@ -34,10 +34,8 @@ #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 { diff --git a/source/blender/draw/modes/paint_texture_mode.c b/source/blender/draw/modes/paint_texture_mode.c index 094e4bdced4..5b8b597c349 100644 --- a/source/blender/draw/modes/paint_texture_mode.c +++ b/source/blender/draw/modes/paint_texture_mode.c @@ -39,7 +39,6 @@ #include "draw_common.h" -#include "draw_mode_engines.h" #include "DNA_mesh_types.h" diff --git a/source/blender/draw/modes/paint_vertex_mode.c b/source/blender/draw/modes/paint_vertex_mode.c index d63f6216e92..b7581cf13f2 100644 --- a/source/blender/draw/modes/paint_vertex_mode.c +++ b/source/blender/draw/modes/paint_vertex_mode.c @@ -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" diff --git a/source/blender/draw/modes/paint_weight_mode.c b/source/blender/draw/modes/paint_weight_mode.c index 7d4b3cac41b..14b9a27928c 100644 --- a/source/blender/draw/modes/paint_weight_mode.c +++ b/source/blender/draw/modes/paint_weight_mode.c @@ -26,7 +26,6 @@ * \ingroup draw */ -#include "DRW_engine.h" #include "DRW_render.h" /* If builtin shaders are needed */ @@ -34,13 +33,9 @@ #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[]; diff --git a/source/blender/draw/modes/particle_mode.c b/source/blender/draw/modes/particle_mode.c index 3827dba8ac1..eb3f73235e4 100644 --- a/source/blender/draw/modes/particle_mode.c +++ b/source/blender/draw/modes/particle_mode.c @@ -26,29 +26,21 @@ * \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[]; diff --git a/source/blender/draw/modes/pose_mode.c b/source/blender/draw/modes/pose_mode.c index 37a61692a37..bf95f0e38e9 100644 --- a/source/blender/draw/modes/pose_mode.c +++ b/source/blender/draw/modes/pose_mode.c @@ -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 diff --git a/source/blender/draw/modes/sculpt_mode.c b/source/blender/draw/modes/sculpt_mode.c index c38bd8faddd..94ad86d70c0 100644 --- a/source/blender/draw/modes/sculpt_mode.c +++ b/source/blender/draw/modes/sculpt_mode.c @@ -36,16 +36,11 @@ #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[]; |