Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-01-26 12:07:31 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-01-26 12:08:52 +0300
commit19b5f5493cd6a9b60486d570b6a50c7a42a96ae0 (patch)
tree57b8879621b1590431dc50605a1d25a239c78d27 /source/blender/draw/intern
parentb8467273b893967fdecce81c92f8d680edde0059 (diff)
Cleanup: draw manager headers
Diffstat (limited to 'source/blender/draw/intern')
-rw-r--r--source/blender/draw/intern/draw_anim_viz.c8
-rw-r--r--source/blender/draw/intern/draw_armature.c13
-rw-r--r--source/blender/draw/intern/draw_cache.c3
-rw-r--r--source/blender/draw/intern/draw_cache_impl_displist.c1
-rw-r--r--source/blender/draw/intern/draw_cache_impl_mesh.c9
-rw-r--r--source/blender/draw/intern/draw_cache_impl_metaball.c1
-rw-r--r--source/blender/draw/intern/draw_cache_impl_particles.c2
-rw-r--r--source/blender/draw/intern/draw_hair.c6
-rw-r--r--source/blender/draw/intern/draw_manager.c4
-rw-r--r--source/blender/draw/intern/draw_manager_exec.c4
-rw-r--r--source/blender/draw/intern/draw_manager_profiling.c3
-rw-r--r--source/blender/draw/intern/draw_manager_shader.c2
-rw-r--r--source/blender/draw/intern/draw_manager_text.c3
-rw-r--r--source/blender/draw/intern/draw_view.c6
14 files changed, 0 insertions, 65 deletions
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"