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>2014-04-30 21:55:41 +0400
committerCampbell Barton <ideasman42@gmail.com>2014-04-30 22:47:51 +0400
commit4ca67869cc7ad480670d60eae1df3d2aca03f016 (patch)
tree24ff34491b5e51a3301b49ffc10aa9c1c5211c30 /source/blender/render
parent19cd6922a5785584d741126141f336b9bae1e032 (diff)
Code cleanup: remove unused includes
Opted to keep includes if they are used indirectly (even if removing is possible).
Diffstat (limited to 'source/blender/render')
-rw-r--r--source/blender/render/intern/source/bake.c1
-rw-r--r--source/blender/render/intern/source/convertblender.c20
-rw-r--r--source/blender/render/intern/source/envmap.c5
-rw-r--r--source/blender/render/intern/source/imagetexture.c5
-rw-r--r--source/blender/render/intern/source/initrender.c11
-rw-r--r--source/blender/render/intern/source/multires_bake.c1
-rw-r--r--source/blender/render/intern/source/occlusion.c2
-rw-r--r--source/blender/render/intern/source/pipeline.c2
-rw-r--r--source/blender/render/intern/source/pixelblending.c2
-rw-r--r--source/blender/render/intern/source/pixelshading.c5
-rw-r--r--source/blender/render/intern/source/pointdensity.c2
-rw-r--r--source/blender/render/intern/source/rayshade.c1
-rw-r--r--source/blender/render/intern/source/render_result.c2
-rw-r--r--source/blender/render/intern/source/render_texture.c6
-rw-r--r--source/blender/render/intern/source/rendercore.c11
-rw-r--r--source/blender/render/intern/source/renderdatabase.c4
-rw-r--r--source/blender/render/intern/source/shadeinput.c4
-rw-r--r--source/blender/render/intern/source/sss.c3
-rw-r--r--source/blender/render/intern/source/sunsky.c1
-rw-r--r--source/blender/render/intern/source/volume_precache.c1
-rw-r--r--source/blender/render/intern/source/volumetric.c5
-rw-r--r--source/blender/render/intern/source/zbuf.c1
22 files changed, 0 insertions, 95 deletions
diff --git a/source/blender/render/intern/source/bake.c b/source/blender/render/intern/source/bake.c
index 0d165f4e060..f3cddf0c7cb 100644
--- 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"
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index 37ef16d7105..ac2c419bc6a 100644
--- 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"
diff --git a/source/blender/render/intern/source/envmap.c b/source/blender/render/intern/source/envmap.c
index 88c351f3f00..52ebfd07a54 100644
--- 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"
diff --git a/source/blender/render/intern/source/imagetexture.c b/source/blender/render/intern/source/imagetexture.c
index 7733e5acfbb..7d4b70cea15 100644
--- 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"
diff --git a/source/blender/render/intern/source/initrender.c b/source/blender/render/intern/source/initrender.c
index 2c431bf869c..5fd4747f19b 100644
--- 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"
diff --git a/source/blender/render/intern/source/multires_bake.c b/source/blender/render/intern/source/multires_bake.c
index 7e07054772c..4ac1593d1bb 100644
--- 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"
diff --git a/source/blender/render/intern/source/occlusion.c b/source/blender/render/intern/source/occlusion.c
index 3fafc61b42a..dd0b1f89da7 100644
--- 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"
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 3d45c8b82cf..36945e7081e 100644
--- 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
diff --git a/source/blender/render/intern/source/pixelblending.c b/source/blender/render/intern/source/pixelblending.c
index 7f5b0a5b20b..460a6814f07 100644
--- 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"
diff --git a/source/blender/render/intern/source/pixelshading.c b/source/blender/render/intern/source/pixelshading.c
index 0c3da335963..09a6a6374be 100644
--- 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 */
diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c
index 51fe4892ff7..799f7fa2f2e 100644
--- 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"
diff --git a/source/blender/render/intern/source/rayshade.c b/source/blender/render/intern/source/rayshade.c
index e39a1109680..7e56d93f23b 100644
--- 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"
diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/source/render_result.c
index 9056305823e..9b02a08476d 100644
--- 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"
diff --git a/source/blender/render/intern/source/render_texture.c b/source/blender/render/intern/source/render_texture.c
index 3936305b22e..597f93a2659 100644
--- 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"
diff --git a/source/blender/render/intern/source/rendercore.c b/source/blender/render/intern/source/rendercore.c
index 1e38fd97bf6..27bc449dce3 100644
--- 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"
diff --git a/source/blender/render/intern/source/renderdatabase.c b/source/blender/render/intern/source/renderdatabase.c
index 0d5b0b920b4..6a3787289d8 100644
--- 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 */
diff --git a/source/blender/render/intern/source/shadeinput.c b/source/blender/render/intern/source/shadeinput.c
index 6aeee7721c5..7aca6b9ac87 100644
--- 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"
diff --git a/source/blender/render/intern/source/sss.c b/source/blender/render/intern/source/sss.c
index 99829851494..52d3815c4ad 100644
--- 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"
diff --git a/source/blender/render/intern/source/sunsky.c b/source/blender/render/intern/source/sunsky.c
index 45dbe3f190d..71ef5b8f62f 100644
--- 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
diff --git a/source/blender/render/intern/source/volume_precache.c b/source/blender/render/intern/source/volume_precache.c
index a3a4f23b526..6135a8761bb 100644
--- 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 */
diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index 6b1c03bd4ba..fe3af5b840e 100644
--- 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"
diff --git a/source/blender/render/intern/source/zbuf.c b/source/blender/render/intern/source/zbuf.c
index a9253a8e635..28849ed7686 100644
--- 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"