Code cleanup: remove unused includes

Opted to keep includes if they are used indirectly (even if removing is possible).
2014-05-01 03:55:41 +10:00
parent 19cd6922a5
commit 4ca67869cc
345 changed files with 9 additions and 996 deletions
--- a/source/blender/render/intern/source/bake.c
+++ b/source/blender/render/intern/source/bake.c
@@ -34,7 +34,6 @@
 #include "MEM_guardedalloc.h"

 #include "BLI_math.h"
-#include "BLI_blenlib.h"
 #include "BLI_threads.h"
 #include "BLI_utildefines.h"

--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -39,56 +39,39 @@
 #include "BLI_blenlib.h"
 #include "BLI_utildefines.h"
 #include "BLI_rand.h"
-#include "BLI_task.h"
 #include "BLI_memarena.h"
-#include "BLI_linklist.h"
 #ifdef WITH_FREESTYLE
 #  include "BLI_edgehash.h"
 #endif

 #include "BLF_translation.h"

-#include "DNA_armature_types.h"
-#include "DNA_camera_types.h"
 #include "DNA_material_types.h"
 #include "DNA_curve_types.h"
-#include "DNA_effect_types.h"
 #include "DNA_group_types.h"
 #include "DNA_lamp_types.h"
 #include "DNA_image_types.h"
-#include "DNA_lattice_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
-#include "DNA_meta_types.h"
 #include "DNA_modifier_types.h"
 #include "DNA_node_types.h"
 #include "DNA_object_types.h"
-#include "DNA_object_force.h"
 #include "DNA_object_fluidsim.h"
 #include "DNA_particle_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_texture_types.h"
-#include "DNA_view3d_types.h"

 #include "BKE_anim.h"
-#include "BKE_armature.h"
-#include "BKE_action.h"
 #include "BKE_curve.h"
 #include "BKE_customdata.h"
 #include "BKE_colortools.h"
-#include "BKE_constraint.h"
 #include "BKE_displist.h"
-#include "BKE_deform.h"
 #include "BKE_depsgraph.h"
 #include "BKE_DerivedMesh.h"
-#include "BKE_effect.h"
 #include "BKE_global.h"
-#include "BKE_group.h"
 #include "BKE_key.h"
-#include "BKE_ipo.h"
 #include "BKE_image.h"
 #include "BKE_lattice.h"
-#include "BKE_library.h"
 #include "BKE_material.h"
 #include "BKE_main.h"
 #include "BKE_mball.h"
@@ -98,10 +81,7 @@
 #include "BKE_object.h"
 #include "BKE_particle.h"
 #include "BKE_scene.h"
-#include "BKE_subsurf.h"
-#include "BKE_texture.h"

-#include "BKE_world.h"

 #include "PIL_time.h"
 #include "IMB_imbuf_types.h"
--- a/source/blender/render/intern/source/envmap.c
+++ b/source/blender/render/intern/source/envmap.c
@@ -31,7 +31,6 @@
 #include <string.h>

 /* external modules: */
-#include "MEM_guardedalloc.h"

 #include "BLI_math.h"
 #include "BLI_blenlib.h"
@@ -50,14 +49,10 @@
 #include "DNA_scene_types.h"
 #include "DNA_texture_types.h"

-#include "BKE_library.h"
 #include "BKE_main.h"
 #include "BKE_image.h"   /* BKE_imbuf_write */
 #include "BKE_texture.h"

-
-
-
 /* this module */
 #include "render_types.h"
 #include "renderpipeline.h"
--- a/source/blender/render/intern/source/imagetexture.c
+++ b/source/blender/render/intern/source/imagetexture.c
@@ -38,8 +38,6 @@
 #include <io.h>
 #endif

-#include "MEM_guardedalloc.h"
-
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"

@@ -52,11 +50,8 @@
 #include "BLI_threads.h"
 #include "BLI_utildefines.h"

-#include "BKE_global.h"
 #include "BKE_main.h"
 #include "BKE_image.h"
-#include "BKE_texture.h"
-#include "BKE_library.h"

 #include "RE_render_ext.h"

--- a/source/blender/render/intern/source/initrender.c
+++ b/source/blender/render/intern/source/initrender.c
@@ -44,23 +44,12 @@
 #include "BLI_utildefines.h"

 #include "DNA_camera_types.h"
-#include "DNA_group_types.h"
 #include "DNA_image_types.h"
-#include "DNA_lamp_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"


 #include "BKE_camera.h"
-#include "BKE_global.h"
-#include "BKE_material.h"
-#include "BKE_object.h"
-#include "BKE_image.h"
-#include "BKE_ipo.h"
-#include "BKE_key.h"
-#include "BKE_action.h"
-#include "BKE_writeavi.h"
-#include "BKE_scene.h"

 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"
--- a/source/blender/render/intern/source/multires_bake.c
+++ b/source/blender/render/intern/source/multires_bake.c
@@ -42,7 +42,6 @@
 #include "BLI_threads.h"

 #include "BKE_ccg.h"
-#include "BKE_context.h"
 #include "BKE_global.h"
 #include "BKE_image.h"
 #include "BKE_multires.h"
--- a/source/blender/render/intern/source/occlusion.c
+++ b/source/blender/render/intern/source/occlusion.c
@@ -39,14 +39,12 @@
 #include "DNA_material_types.h"

 #include "BLI_math.h"
-#include "BLI_blenlib.h"
 #include "BLI_memarena.h"
 #include "BLI_threads.h"
 #include "BLI_utildefines.h"

 #include "BLF_translation.h"

-#include "BKE_global.h"
 #include "BKE_scene.h"


--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -35,7 +35,6 @@
 #include <stdlib.h>
 #include <stddef.h>

-#include "DNA_group_types.h"
 #include "DNA_image_types.h"
 #include "DNA_node_types.h"
 #include "DNA_object_types.h"
@@ -80,7 +79,6 @@
 #include "RE_pipeline.h"

 #ifdef WITH_FREESTYLE
-#  include "BKE_library.h"
 #  include "FRS_freestyle.h"
 #endif

--- a/source/blender/render/intern/source/pixelblending.c
+++ b/source/blender/render/intern/source/pixelblending.c
@@ -35,8 +35,6 @@
 #include <string.h>

 /* global includes */
-#include "BLI_math.h"
-#include "BLI_rand.h"

 /* own includes */
 #include "render_types.h"
--- a/source/blender/render/intern/source/pixelshading.c
+++ b/source/blender/render/intern/source/pixelshading.c
@@ -39,7 +39,6 @@
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"

-#include "DNA_camera_types.h"
 #include "DNA_group_types.h"
 #include "DNA_material_types.h"
 #include "DNA_object_types.h"
@@ -47,11 +46,7 @@
 #include "DNA_texture_types.h"
 #include "DNA_lamp_types.h"

-#include "BKE_colortools.h"
-#include "BKE_image.h"
-#include "BKE_global.h"
 #include "BKE_material.h"
-#include "BKE_texture.h"


 /* own module */
--- a/source/blender/render/intern/source/pointdensity.c
+++ b/source/blender/render/intern/source/pointdensity.c
@@ -43,10 +43,8 @@
 #include "BLF_translation.h"

 #include "BKE_DerivedMesh.h"
-#include "BKE_global.h"
 #include "BKE_lattice.h"
 #include "BKE_main.h"
-#include "BKE_object.h"
 #include "BKE_particle.h"
 #include "BKE_scene.h"
 #include "BKE_texture.h"
--- a/source/blender/render/intern/source/rayshade.c
+++ b/source/blender/render/intern/source/rayshade.c
@@ -48,7 +48,6 @@

 #include "BLF_translation.h"

-#include "BKE_global.h"
 #include "BKE_node.h"


--- a/source/blender/render/intern/source/render_result.c
+++ b/source/blender/render/intern/source/render_result.c
@@ -36,7 +36,6 @@
 #include "MEM_guardedalloc.h"

 #include "BLI_utildefines.h"
-#include "BLI_fileops.h"
 #include "BLI_listbase.h"
 #include "BLI_path_util.h"
 #include "BLI_rect.h"
@@ -49,7 +48,6 @@
 #include "BKE_global.h"
 #include "BKE_main.h"
 #include "BKE_report.h"
-#include "BKE_freestyle.h"

 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
--- a/source/blender/render/intern/source/render_texture.c
+++ b/source/blender/render/intern/source/render_texture.c
@@ -33,7 +33,6 @@
 #include <string.h>
 #include <math.h>

-#include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_noise.h"
 #include "BLI_rand.h"
@@ -43,7 +42,6 @@
 #include "DNA_texture_types.h"
 #include "DNA_object_types.h"
 #include "DNA_lamp_types.h"
-#include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_material_types.h"
 #include "DNA_image_types.h"
@@ -53,7 +51,6 @@
 #include "IMB_imbuf.h"
 #include "IMB_colormanagement.h"

-#include "BKE_colortools.h"
 #include "BKE_image.h"
 #include "BKE_node.h"

@@ -64,10 +61,7 @@
 #include "BKE_material.h"
 #include "BKE_scene.h"

-#include "BKE_library.h"
 #include "BKE_texture.h"
-#include "BKE_key.h"
-#include "BKE_ipo.h"

 #include "MEM_guardedalloc.h"

--- a/source/blender/render/intern/source/rendercore.c
+++ b/source/blender/render/intern/source/rendercore.c
@@ -45,23 +45,12 @@
 #include "BLI_threads.h"
 #include "BLI_utildefines.h"

-
-
 #include "DNA_image_types.h"
 #include "DNA_lamp_types.h"
 #include "DNA_material_types.h"
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_group_types.h"

-#include "BKE_customdata.h"
-#include "BKE_depsgraph.h"
-#include "BKE_global.h"
-#include "BKE_image.h"
 #include "BKE_main.h"
-#include "BKE_node.h"
-#include "BKE_texture.h"
-#include "BKE_scene.h"

 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"
--- a/source/blender/render/intern/source/renderdatabase.c
+++ b/source/blender/render/intern/source/renderdatabase.c
@@ -66,16 +66,12 @@
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
 #include "BLI_utildefines.h"
-#include "BLI_ghash.h"
-#include "BLI_memarena.h"

 #include "DNA_material_types.h" 
-#include "DNA_mesh_types.h" 
 #include "DNA_meshdata_types.h" 
 #include "DNA_texture_types.h" 

 #include "BKE_customdata.h"
-#include "BKE_texture.h" 
 #include "BKE_DerivedMesh.h"

 #include "RE_render_ext.h"	/* externtex */
--- a/source/blender/render/intern/source/shadeinput.c
+++ b/source/blender/render/intern/source/shadeinput.c
@@ -34,16 +34,12 @@


 #include "BLI_math.h"
-#include "BLI_blenlib.h"
 #include "BLI_utildefines.h"

-#include "DNA_curve_types.h"
-#include "DNA_group_types.h"
 #include "DNA_lamp_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_material_types.h"

-#include "BKE_colortools.h"
 #include "BKE_scene.h"

 #include "BKE_node.h"
--- a/source/blender/render/intern/source/sss.c
+++ b/source/blender/render/intern/source/sss.c
@@ -61,11 +61,8 @@

 #include "DNA_material_types.h"

-#include "BKE_colortools.h"
 #include "BKE_global.h"
 #include "BKE_main.h"
-#include "BKE_material.h"
-#include "BKE_node.h"
 #include "BKE_scene.h"


--- a/source/blender/render/intern/source/sunsky.c
+++ b/source/blender/render/intern/source/sunsky.c
@@ -28,7 +28,6 @@

 #include "sunsky.h"
 #include "BLI_math.h"
-#include "BKE_global.h"

 /**
 * These macros are defined for vector operations
--- a/source/blender/render/intern/source/volume_precache.c
+++ b/source/blender/render/intern/source/volume_precache.c
@@ -60,7 +60,6 @@
 #include "volumetric.h"
 #include "volume_precache.h"

-#include "BKE_global.h"

 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 /* defined in pipeline.c, is hardcopy of active dynamic allocated Render */
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -29,15 +29,11 @@
 *  \ingroup render
 */

-
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
 #include <float.h>

-#include "MEM_guardedalloc.h"
-
-#include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_rand.h"
 #include "BLI_voxel.h"
@@ -50,7 +46,6 @@
 #include "DNA_lamp_types.h"
 #include "DNA_meta_types.h"

-#include "BKE_global.h"

 #include "render_types.h"
 #include "pixelshading.h"
--- a/source/blender/render/intern/source/zbuf.c
+++ b/source/blender/render/intern/source/zbuf.c
@@ -49,7 +49,6 @@
 #include "MEM_guardedalloc.h"

 #include "DNA_lamp_types.h"
-#include "DNA_mesh_types.h"
 #include "DNA_node_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_material_types.h"