diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-11-29 00:16:14 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-11-29 00:16:14 +0300 |
commit | 915235c87a1621ba000a427ad3eac8a49ff2c0c7 (patch) | |
tree | 4e2c14013caf433afad3faa3a187ceea68c86f7b | |
parent | bcbbc66795e221474f889b7ab9b7320948aefdec (diff) |
Cleanup: unused headers
163 files changed, 8 insertions, 402 deletions
diff --git a/source/blender/blenfont/intern/blf_util.c b/source/blender/blenfont/intern/blf_util.c index 06309a944e9..cdd81e33b0a 100644 --- a/source/blender/blenfont/intern/blf_util.c +++ b/source/blender/blenfont/intern/blf_util.c @@ -38,7 +38,6 @@ #include "blf_internal.h" #include "BLI_utildefines.h" -#include "BLI_string_utf8.h" unsigned int blf_next_p2(unsigned int x) { diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index bd357541256..526ba618f20 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -73,10 +73,8 @@ static DerivedMesh *navmesh_dm_createNavMeshForVisualization(DerivedMesh *dm); #include "BLI_sys_types.h" /* for intptr_t support */ #include "GPU_buffers.h" -#include "GPU_draw.h" #include "GPU_extensions.h" #include "GPU_glew.h" -#include "GPU_material.h" /* very slow! enable for testing only! */ // #define USE_MODIFIER_VALIDATE diff --git a/source/blender/blenkernel/intern/addon.c b/source/blender/blenkernel/intern/addon.c index 119fa266908..28667d458b8 100644 --- a/source/blender/blenkernel/intern/addon.c +++ b/source/blender/blenkernel/intern/addon.c @@ -29,15 +29,9 @@ #include "BLI_utildefines.h" #include "BLI_ghash.h" -#include "BLI_string.h" #include "BKE_addon.h" /* own include */ -#include "RNA_access.h" -#include "RNA_define.h" - -#include "BLF_translation.h" - #include "MEM_guardedalloc.h" static GHash *global_addonpreftype_hash = NULL; diff --git a/source/blender/blenkernel/intern/autoexec.c b/source/blender/blenkernel/intern/autoexec.c index 872780bd50a..e161db9da4f 100644 --- a/source/blender/blenkernel/intern/autoexec.c +++ b/source/blender/blenkernel/intern/autoexec.c @@ -34,7 +34,6 @@ #include "BLI_utildefines.h" #include "BLI_fnmatch.h" -#include "BLI_string.h" #include "BLI_path_util.h" #include "BKE_autoexec.h" /* own include */ diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c index 0fdd838f5fc..92f66cdde76 100644 --- a/source/blender/blenkernel/intern/brush.c +++ b/source/blender/blenkernel/intern/brush.c @@ -33,7 +33,6 @@ #include "BLI_math.h" #include "BLI_blenlib.h" #include "BLI_rand.h" -#include "BLI_rect.h" #include "BKE_brush.h" #include "BKE_colortools.h" @@ -49,7 +48,6 @@ #include "IMB_imbuf_types.h" #include "RE_render_ext.h" /* externtex */ -#include "RE_shader_ext.h" static RNG *brush_rng; diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index e3950567d80..cb57a39f89a 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -35,7 +35,6 @@ */ #include "BLI_math.h" -#include "BLI_blenlib.h" #include "BLI_edgehash.h" #include "BLI_utildefines.h" #include "BLI_stackdefines.h" @@ -49,7 +48,6 @@ #include "BKE_editmesh.h" #include "BKE_curve.h" -#include "DNA_material_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" @@ -61,7 +59,6 @@ #include "GPU_draw.h" #include "GPU_extensions.h" #include "GPU_glew.h" -#include "GPU_material.h" #include <string.h> #include <limits.h> diff --git a/source/blender/blenkernel/intern/colortools.c b/source/blender/blenkernel/intern/colortools.c index a63e06c7cb8..89c3e4b0cfc 100644 --- a/source/blender/blenkernel/intern/colortools.c +++ b/source/blender/blenkernel/intern/colortools.c @@ -50,7 +50,6 @@ #include "IMB_colormanagement.h" -#include "IMB_imbuf.h" #include "IMB_imbuf_types.h" /* ********************************* color curve ********************* */ diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c index 893c69741cd..80a8d373220 100644 --- a/source/blender/blenkernel/intern/displist.c +++ b/source/blender/blenkernel/intern/displist.c @@ -37,7 +37,6 @@ #include "MEM_guardedalloc.h" #include "DNA_curve_types.h" -#include "DNA_meshdata_types.h" #include "DNA_scene_types.h" #include "DNA_object_types.h" #include "DNA_vfont_types.h" diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index 4719013e2f8..06aa1e23bca 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -71,10 +71,6 @@ #include "BKE_scene.h" #include "BKE_texture.h" -#include "RNA_access.h" -#include "RNA_define.h" -#include "RNA_enum_types.h" - /* for image output */ #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" diff --git a/source/blender/blenkernel/intern/lamp.c b/source/blender/blenkernel/intern/lamp.c index 4a413850ec0..e738b16c8cc 100644 --- a/source/blender/blenkernel/intern/lamp.c +++ b/source/blender/blenkernel/intern/lamp.c @@ -41,7 +41,6 @@ #include "DNA_scene_types.h" #include "DNA_texture_types.h" -#include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/linestyle.c b/source/blender/blenkernel/intern/linestyle.c index bcdaf9b7af0..5bee93349d8 100644 --- a/source/blender/blenkernel/intern/linestyle.c +++ b/source/blender/blenkernel/intern/linestyle.c @@ -53,8 +53,6 @@ #include "BKE_colortools.h" #include "BKE_animsys.h" -#include "RNA_access.h" - static const char *modifier_name[LS_MODIFIER_NUM] = { NULL, "Along Stroke", diff --git a/source/blender/blenkernel/intern/mask.c b/source/blender/blenkernel/intern/mask.c index 37d1093347f..b8c78ce912c 100644 --- a/source/blender/blenkernel/intern/mask.c +++ b/source/blender/blenkernel/intern/mask.c @@ -59,8 +59,6 @@ #include "BKE_movieclip.h" #include "BKE_image.h" -#include "NOD_composite.h" - static struct { ListBase splines; struct GHash *id_hash; diff --git a/source/blender/blenkernel/intern/mask_evaluate.c b/source/blender/blenkernel/intern/mask_evaluate.c index 3ed6148054c..5517fc36bc1 100644 --- a/source/blender/blenkernel/intern/mask_evaluate.c +++ b/source/blender/blenkernel/intern/mask_evaluate.c @@ -40,8 +40,6 @@ #include "BLI_math.h" #include "DNA_mask_types.h" -#include "DNA_node_types.h" -#include "DNA_scene_types.h" #include "BKE_curve.h" #include "BKE_mask.h" diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index 79c71284945..54ab5a8aca7 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -47,7 +47,6 @@ #include "DNA_armature_types.h" #include "DNA_object_types.h" -#include "DNA_meshdata_types.h" #include "BLI_utildefines.h" #include "BLI_path_util.h" diff --git a/source/blender/blenkernel/intern/movieclip.c b/source/blender/blenkernel/intern/movieclip.c index b387c7d2d1b..f62855efe75 100644 --- a/source/blender/blenkernel/intern/movieclip.c +++ b/source/blender/blenkernel/intern/movieclip.c @@ -69,7 +69,6 @@ #include "BKE_image.h" /* openanim */ #include "BKE_tracking.h" -#include "IMB_colormanagement.h" #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" #include "IMB_moviecache.h" @@ -78,8 +77,6 @@ # include "intern/openexr/openexr_multi.h" #endif -#include "NOD_composite.h" - /*********************** movieclip buffer loaders *************************/ static int sequence_guess_offset(const char *full_name, int head_len, unsigned short numlen) diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c index 13eca4bebf4..b1d247a3d2c 100644 --- a/source/blender/blenkernel/intern/pointcache.c +++ b/source/blender/blenkernel/intern/pointcache.c @@ -50,7 +50,6 @@ #include "BLI_threads.h" #include "BLI_math.h" #include "BLI_utildefines.h" -#include "BLI_system.h" #include "BLF_translation.h" diff --git a/source/blender/blenkernel/intern/rigidbody.c b/source/blender/blenkernel/intern/rigidbody.c index 4b8f60d7446..3bf5c4cc47e 100644 --- a/source/blender/blenkernel/intern/rigidbody.c +++ b/source/blender/blenkernel/intern/rigidbody.c @@ -62,8 +62,6 @@ #include "BKE_pointcache.h" #include "BKE_rigidbody.h" -#include "RNA_access.h" - #ifdef WITH_BULLET /* ************************************** */ diff --git a/source/blender/blenkernel/intern/shrinkwrap.c b/source/blender/blenkernel/intern/shrinkwrap.c index d2a4d15a2c6..d91818615f3 100644 --- a/source/blender/blenkernel/intern/shrinkwrap.c +++ b/source/blender/blenkernel/intern/shrinkwrap.c @@ -52,7 +52,6 @@ #include "BKE_deform.h" #include "BKE_mesh.h" /* for OMP limits. */ #include "BKE_subsurf.h" -#include "BKE_editmesh.h" #include "BLI_strict_flags.h" diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index 455c254242a..12d7409ffe7 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -41,7 +41,6 @@ #include "MEM_guardedalloc.h" -#include "DNA_material_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" @@ -66,8 +65,6 @@ #include "BKE_scene.h" #include "BKE_subsurf.h" -#include "PIL_time.h" - #ifndef USE_DYNSIZE # include "BLI_array.h" #endif @@ -75,7 +72,6 @@ #include "GPU_draw.h" #include "GPU_extensions.h" #include "GPU_glew.h" -#include "GPU_material.h" #include "CCGSubSurf.h" diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c index b1981a3a804..9d8dce6232f 100644 --- a/source/blender/blenkernel/intern/texture.c +++ b/source/blender/blenkernel/intern/texture.c @@ -37,7 +37,6 @@ #include "MEM_guardedalloc.h" -#include "BLI_blenlib.h" #include "BLI_math.h" #include "BLI_kdopbvh.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/tracking_detect.c b/source/blender/blenkernel/intern/tracking_detect.c index 62039b761e8..6df51b5441a 100644 --- a/source/blender/blenkernel/intern/tracking_detect.c +++ b/source/blender/blenkernel/intern/tracking_detect.c @@ -40,7 +40,6 @@ #include "BKE_tracking.h" #include "IMB_imbuf_types.h" -#include "IMB_imbuf.h" #include "libmv-capi.h" diff --git a/source/blender/blenkernel/intern/tracking_region_tracker.c b/source/blender/blenkernel/intern/tracking_region_tracker.c index 09c95ae4321..72c9b86270b 100644 --- a/source/blender/blenkernel/intern/tracking_region_tracker.c +++ b/source/blender/blenkernel/intern/tracking_region_tracker.c @@ -35,11 +35,8 @@ #include "MEM_guardedalloc.h" #include "DNA_movieclip_types.h" -#include "DNA_object_types.h" /* SELECT */ #include "BLI_utildefines.h" -#include "BLI_math.h" -#include "BLI_ghash.h" #include "BLI_threads.h" #include "BKE_tracking.h" diff --git a/source/blender/blenkernel/intern/world.c b/source/blender/blenkernel/intern/world.c index 29a345e111b..2a31cb7b429 100644 --- a/source/blender/blenkernel/intern/world.c +++ b/source/blender/blenkernel/intern/world.c @@ -38,7 +38,6 @@ #include "DNA_scene_types.h" #include "DNA_texture_types.h" -#include "BLI_listbase.h" #include "BLI_utildefines.h" #include "BKE_animsys.h" diff --git a/source/blender/blenkernel/intern/writeavi.c b/source/blender/blenkernel/intern/writeavi.c index aef44993912..8a6a0438b84 100644 --- a/source/blender/blenkernel/intern/writeavi.c +++ b/source/blender/blenkernel/intern/writeavi.c @@ -80,7 +80,9 @@ static void filepath_avi(char *string, RenderData *rd); # include "BKE_writeffmpeg.h" #endif -#include "BKE_writeframeserver.h" +#ifdef WITH_FRAMESERVER +# include "BKE_writeframeserver.h" +#endif bMovieHandle *BKE_movie_handle_get(const char imtype) { diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c index 1fe5d345621..d4589237b6c 100644 --- a/source/blender/blenkernel/intern/writeffmpeg.c +++ b/source/blender/blenkernel/intern/writeffmpeg.c @@ -57,7 +57,6 @@ #include "BKE_sound.h" #include "BKE_writeffmpeg.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" #include "ffmpeg_compat.h" diff --git a/source/blender/blenlib/intern/lasso.c b/source/blender/blenlib/intern/lasso.c index e89f7fd795b..23704538413 100644 --- a/source/blender/blenlib/intern/lasso.c +++ b/source/blender/blenlib/intern/lasso.c @@ -33,7 +33,6 @@ #include "DNA_vec_types.h" #include "BLI_math.h" -#include "BLI_rect.h" #include "BLI_strict_flags.h" #include "BLI_lasso.h" /* own include */ diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 05af147eb86..7c606fe072c 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -141,13 +141,9 @@ #include "BKE_treehash.h" #include "BKE_sound.h" -#include "IMB_imbuf.h" // for proxy / timecode versioning stuff #include "NOD_common.h" #include "NOD_socket.h" -#include "NOD_composite.h" -#include "NOD_shader.h" -#include "NOD_texture.h" #include "BLO_readfile.h" #include "BLO_undofile.h" @@ -157,7 +153,6 @@ #include "readfile.h" -#include "PIL_time.h" #include <errno.h> diff --git a/source/blender/blenloader/intern/runtime.c b/source/blender/blenloader/intern/runtime.c index d6fd2f92443..ec496e1c866 100644 --- a/source/blender/blenloader/intern/runtime.c +++ b/source/blender/blenloader/intern/runtime.c @@ -51,7 +51,6 @@ #include "BLO_readfile.h" #include "BLO_runtime.h" -#include "BKE_blender.h" #include "BKE_report.h" /* Runtime reading */ diff --git a/source/blender/blenloader/intern/undofile.c b/source/blender/blenloader/intern/undofile.c index 12f4a295a34..f70d889828f 100644 --- a/source/blender/blenloader/intern/undofile.c +++ b/source/blender/blenloader/intern/undofile.c @@ -40,7 +40,6 @@ #include "DNA_listBase.h" #include "BLI_blenlib.h" -#include "BLI_linklist.h" #include "BLO_undofile.h" diff --git a/source/blender/blenloader/intern/versioning_250.c b/source/blender/blenloader/intern/versioning_250.c index 40b756a3f7c..a4d2399b9ce 100644 --- a/source/blender/blenloader/intern/versioning_250.c +++ b/source/blender/blenloader/intern/versioning_250.c @@ -25,8 +25,6 @@ * \ingroup blenloader */ -#include "zlib.h" - #ifndef WIN32 # include <unistd.h> /* for read close */ #else @@ -90,14 +88,9 @@ #include "NOD_socket.h" #include "BLO_readfile.h" -#include "BLO_undofile.h" - -#include "RE_engine.h" #include "readfile.h" -#include "PIL_time.h" - #include <errno.h> /* 2.50 patch */ diff --git a/source/blender/blenloader/intern/versioning_legacy.c b/source/blender/blenloader/intern/versioning_legacy.c index d16d5130909..c6db6c4476c 100644 --- a/source/blender/blenloader/intern/versioning_legacy.c +++ b/source/blender/blenloader/intern/versioning_legacy.c @@ -30,8 +30,6 @@ */ -#include "zlib.h" - #include <limits.h> #ifndef WIN32 @@ -94,14 +92,9 @@ #include "BKE_scene.h" #include "BKE_sequencer.h" -#include "IMB_imbuf.h" // for proxy / timecode versioning stuff - #include "NOD_socket.h" #include "BLO_readfile.h" -#include "BLO_undofile.h" - -#include "RE_engine.h" #include "readfile.h" diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index 13cceb9fe45..c6c10c48b40 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -79,8 +79,6 @@ #include <string.h> #include <stdlib.h> -#include "zlib.h" - #ifdef WIN32 # include "winsock2.h" # include <io.h> @@ -156,7 +154,6 @@ #include "BKE_node.h" #include "BKE_report.h" #include "BKE_sequencer.h" -#include "BKE_sound.h" #include "BKE_subsurf.h" #include "BKE_modifier.h" #include "BKE_fcurve.h" @@ -164,11 +161,9 @@ #include "BKE_mesh.h" #ifdef USE_NODE_COMPAT_CUSTOMNODES -#include "NOD_common.h" #include "NOD_socket.h" /* for sock->default_value data */ #endif -#include "RNA_access.h" #include "BLO_writefile.h" #include "BLO_readfile.h" diff --git a/source/blender/bmesh/operators/bmo_wireframe.c b/source/blender/bmesh/operators/bmo_wireframe.c index 62409fc3987..ac81dde93c0 100644 --- a/source/blender/bmesh/operators/bmo_wireframe.c +++ b/source/blender/bmesh/operators/bmo_wireframe.c @@ -26,8 +26,6 @@ * Creates a solid wireframe from connected faces. */ -#include "MEM_guardedalloc.h" - #include "DNA_material_types.h" #include "BLI_sys_types.h" diff --git a/source/blender/editors/animation/keyframes_edit.c b/source/blender/editors/animation/keyframes_edit.c index 2f2676dc87d..3dc58ce31bd 100644 --- a/source/blender/editors/animation/keyframes_edit.c +++ b/source/blender/editors/animation/keyframes_edit.c @@ -41,7 +41,6 @@ #include "DNA_anim_types.h" #include "DNA_object_types.h" -#include "DNA_node_types.h" #include "DNA_scene_types.h" #include "BKE_fcurve.h" diff --git a/source/blender/editors/animation/keyframes_general.c b/source/blender/editors/animation/keyframes_general.c index 6e59bb9f463..d00a64abb9b 100644 --- a/source/blender/editors/animation/keyframes_general.c +++ b/source/blender/editors/animation/keyframes_general.c @@ -49,7 +49,6 @@ #include "BKE_global.h" #include "RNA_access.h" -#include "RNA_enum_types.h" #include "ED_anim_api.h" #include "ED_keyframing.h" diff --git a/source/blender/editors/gpencil/drawgpencil.c b/source/blender/editors/gpencil/drawgpencil.c index 5a838d7bc39..76502a43eb7 100644 --- a/source/blender/editors/gpencil/drawgpencil.c +++ b/source/blender/editors/gpencil/drawgpencil.c @@ -58,8 +58,6 @@ #include "ED_gpencil.h" #include "ED_view3d.h" -#include "gpencil_intern.h" - /* ************************************************** */ /* GREASE PENCIL DRAWING */ diff --git a/source/blender/editors/gpencil/editaction_gpencil.c b/source/blender/editors/gpencil/editaction_gpencil.c index dba80164e93..f05efff211c 100644 --- a/source/blender/editors/gpencil/editaction_gpencil.c +++ b/source/blender/editors/gpencil/editaction_gpencil.c @@ -49,8 +49,6 @@ #include "ED_keyframes_edit.h" #include "ED_markers.h" -#include "gpencil_intern.h" - /* ***************************************** */ /* NOTE ABOUT THIS FILE: * This file contains code for editing Grease Pencil data in the Action Editor diff --git a/source/blender/editors/gpencil/gpencil_buttons.c b/source/blender/editors/gpencil/gpencil_buttons.c index a7635c12d56..d305cfed009 100644 --- a/source/blender/editors/gpencil/gpencil_buttons.c +++ b/source/blender/editors/gpencil/gpencil_buttons.c @@ -55,8 +55,6 @@ #include "UI_interface.h" #include "UI_resources.h" -#include "gpencil_intern.h" - /* ************************************************** */ /* GREASE PENCIL PANEL-UI DRAWING */ diff --git a/source/blender/editors/io/io_ops.c b/source/blender/editors/io/io_ops.c index a33340cc39a..cb8329ef536 100644 --- a/source/blender/editors/io/io_ops.c +++ b/source/blender/editors/io/io_ops.c @@ -28,14 +28,6 @@ * \ingroup collada */ - -#include "io_collada.h" - -#include "BLI_utildefines.h" - -#include "WM_types.h" -#include "WM_api.h" - #include "io_ops.h" /* own include */ void ED_operatortypes_io(void) diff --git a/source/blender/editors/object/object_bake.c b/source/blender/editors/object/object_bake.c index 011e7c574af..758f4d180b9 100644 --- a/source/blender/editors/object/object_bake.c +++ b/source/blender/editors/object/object_bake.c @@ -45,7 +45,6 @@ #include "BLI_blenlib.h" #include "BLI_threads.h" #include "BLI_utildefines.h" -#include "BLI_math.h" #include "BKE_blender.h" #include "BKE_screen.h" diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c index b53891f4880..b5adf38527b 100644 --- a/source/blender/editors/physics/physics_fluid.c +++ b/source/blender/editors/physics/physics_fluid.c @@ -72,8 +72,6 @@ #include "DNA_scene_types.h" #include "DNA_mesh_types.h" -#include "PIL_time.h" - static float get_fluid_viscosity(FluidsimSettings *settings) { diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c index 929231186f4..fe38fd4806c 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.c +++ b/source/blender/editors/sculpt_paint/paint_vertex.c @@ -66,8 +66,6 @@ #include "WM_api.h" #include "WM_types.h" -#include "GPU_buffers.h" - #include "ED_armature.h" #include "ED_object.h" #include "ED_mesh.h" diff --git a/source/blender/editors/space_node/node_templates.c b/source/blender/editors/space_node/node_templates.c index 9075117a761..8b68ac013c2 100644 --- a/source/blender/editors/space_node/node_templates.c +++ b/source/blender/editors/space_node/node_templates.c @@ -30,7 +30,6 @@ #include "DNA_node_types.h" #include "DNA_screen_types.h" -#include "DNA_space_types.h" #include "BLI_listbase.h" #include "BLI_string.h" diff --git a/source/blender/editors/space_sequencer/sequencer_modifier.c b/source/blender/editors/space_sequencer/sequencer_modifier.c index dc70abada18..83f3f9bc961 100644 --- a/source/blender/editors/space_sequencer/sequencer_modifier.c +++ b/source/blender/editors/space_sequencer/sequencer_modifier.c @@ -34,7 +34,6 @@ #include "BLI_utildefines.h" #include "DNA_scene_types.h" -#include "DNA_userdef_types.h" #include "BKE_context.h" #include "BKE_sequencer.h" diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c index 911403f45cb..d5275adf769 100644 --- a/source/blender/editors/space_view3d/drawmesh.c +++ b/source/blender/editors/space_view3d/drawmesh.c @@ -60,7 +60,6 @@ #include "UI_resources.h" -#include "GPU_buffers.h" #include "GPU_extensions.h" #include "GPU_draw.h" #include "GPU_material.h" diff --git a/source/blender/editors/uvedit/uvedit_parametrizer.c b/source/blender/editors/uvedit/uvedit_parametrizer.c index 79f53e1d971..39ddb19edb7 100644 --- a/source/blender/editors/uvedit/uvedit_parametrizer.c +++ b/source/blender/editors/uvedit/uvedit_parametrizer.c @@ -35,7 +35,6 @@ #include "BLI_boxpack2d.h" #include "BLI_convexhull2d.h" -#include "uvedit_intern.h" #include "uvedit_parametrizer.h" #include <math.h> diff --git a/source/blender/gpu/intern/gpu_buffers.c b/source/blender/gpu/intern/gpu_buffers.c index 54743247fea..985e04bcfbf 100644 --- a/source/blender/gpu/intern/gpu_buffers.c +++ b/source/blender/gpu/intern/gpu_buffers.c @@ -46,13 +46,11 @@ #include "BLI_ghash.h" #include "BLI_threads.h" -#include "DNA_material_types.h" #include "DNA_meshdata_types.h" #include "BKE_ccg.h" #include "BKE_DerivedMesh.h" #include "BKE_paint.h" -#include "BKE_material.h" #include "BKE_pbvh.h" #include "DNA_userdef_types.h" @@ -62,8 +60,6 @@ #include "bmesh.h" -#include "gpu_extensions_private.h" - typedef enum { GPU_BUFFER_VERTEX_STATE = (1 << 0), GPU_BUFFER_NORMAL_STATE = (1 << 1), diff --git a/source/blender/gpu/intern/gpu_codegen.c b/source/blender/gpu/intern/gpu_codegen.c index 1b99c6ee49a..e29d955407c 100644 --- a/source/blender/gpu/intern/gpu_codegen.c +++ b/source/blender/gpu/intern/gpu_codegen.c @@ -51,8 +51,6 @@ #include "gpu_codegen.h" -#include "node_util.h" /* For muting node stuff... */ - #include <string.h> #include <stdarg.h> diff --git a/source/blender/gpu/intern/gpu_init_exit.c b/source/blender/gpu/intern/gpu_init_exit.c index 912774cd345..fd99595b6a4 100644 --- a/source/blender/gpu/intern/gpu_init_exit.c +++ b/source/blender/gpu/intern/gpu_init_exit.c @@ -31,7 +31,6 @@ #include "BLI_sys_types.h" #include "GPU_init_exit.h" /* interface */ -#include "GPU_extensions.h" /* library */ #include "intern/gpu_codegen.h" #include "intern/gpu_extensions_private.h" diff --git a/source/blender/gpu/intern/gpu_select.c b/source/blender/gpu/intern/gpu_select.c index afd6af9efae..0014468d095 100644 --- a/source/blender/gpu/intern/gpu_select.c +++ b/source/blender/gpu/intern/gpu_select.c @@ -33,8 +33,6 @@ #include "GPU_extensions.h" #include "GPU_glew.h" -#include "BLI_utildefines.h" - #include "MEM_guardedalloc.h" #include "DNA_userdef_types.h" diff --git a/source/blender/gpu/intern/gpu_simple_shader.c b/source/blender/gpu/intern/gpu_simple_shader.c index c0d7ebd4abb..3fa5975ef15 100644 --- a/source/blender/gpu/intern/gpu_simple_shader.c +++ b/source/blender/gpu/intern/gpu_simple_shader.c @@ -47,9 +47,6 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#include "DNA_mesh_types.h" -#include "DNA_object_types.h" - #include "GPU_extensions.h" #include "GPU_simple_shader.h" diff --git a/source/blender/ikplugin/intern/ikplugin_api.c b/source/blender/ikplugin/intern/ikplugin_api.c index eaf1db8a1d6..0f81fb34a63 100644 --- a/source/blender/ikplugin/intern/ikplugin_api.c +++ b/source/blender/ikplugin/intern/ikplugin_api.c @@ -32,15 +32,10 @@ #include "BIK_api.h" #include "BLI_blenlib.h" -#include "BLI_math.h" - -#include "BKE_armature.h" #include "DNA_object_types.h" #include "DNA_action_types.h" #include "DNA_scene_types.h" -#include "DNA_constraint_types.h" -#include "DNA_armature_types.h" #include "ikplugin_api.h" diff --git a/source/blender/imbuf/intern/allocimbuf.c b/source/blender/imbuf/intern/allocimbuf.c index 612517775f4..ff9bef74a79 100644 --- a/source/blender/imbuf/intern/allocimbuf.c +++ b/source/blender/imbuf/intern/allocimbuf.c @@ -48,7 +48,6 @@ #include "MEM_guardedalloc.h" #include "BLI_threads.h" -#include "BLI_utildefines.h" static SpinLock refcounter_spin; diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c index eef7964ef3f..b8f6e66adfe 100644 --- a/source/blender/imbuf/intern/anim_movie.c +++ b/source/blender/imbuf/intern/anim_movie.c @@ -70,12 +70,8 @@ #include "MEM_guardedalloc.h" -#include "DNA_userdef_types.h" - #include "BKE_global.h" -#include "imbuf.h" - #ifdef WITH_AVI # include "AVI_avi.h" #endif @@ -89,7 +85,6 @@ #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" -#include "IMB_allocimbuf.h" #include "IMB_anim.h" #include "IMB_indexer.h" diff --git a/source/blender/imbuf/intern/bmp.c b/source/blender/imbuf/intern/bmp.c index dabeec74a62..8853fe449ba 100644 --- a/source/blender/imbuf/intern/bmp.c +++ b/source/blender/imbuf/intern/bmp.c @@ -36,7 +36,6 @@ #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" -#include "IMB_allocimbuf.h" #include "IMB_filetype.h" #include "IMB_colormanagement.h" diff --git a/source/blender/imbuf/intern/colormanagement.c b/source/blender/imbuf/intern/colormanagement.c index de092446ca9..43b766f161b 100644 --- a/source/blender/imbuf/intern/colormanagement.c +++ b/source/blender/imbuf/intern/colormanagement.c @@ -44,7 +44,6 @@ #include "DNA_scene_types.h" #include "DNA_space_types.h" -#include "IMB_filter.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" #include "IMB_filetype.h" @@ -53,7 +52,6 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_fileops.h" #include "BLI_math.h" #include "BLI_math_color.h" #include "BLI_string.h" diff --git a/source/blender/imbuf/intern/divers.c b/source/blender/imbuf/intern/divers.c index 03cd5ecd646..81aef4ac6e4 100644 --- a/source/blender/imbuf/intern/divers.c +++ b/source/blender/imbuf/intern/divers.c @@ -37,7 +37,6 @@ #include "imbuf.h" #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" -#include "IMB_allocimbuf.h" #include "IMB_filter.h" #include "IMB_colormanagement.h" diff --git a/source/blender/imbuf/intern/filetype.c b/source/blender/imbuf/intern/filetype.c index b6b46c72384..c6e358dd3d2 100644 --- a/source/blender/imbuf/intern/filetype.c +++ b/source/blender/imbuf/intern/filetype.c @@ -51,8 +51,6 @@ #include "quicktime_import.h" #endif -#include "imbuf.h" - static int imb_ftype_default(ImFileType *type, ImBuf *ibuf) { return (ibuf->ftype & type->filetype); diff --git a/source/blender/imbuf/intern/iris.c b/source/blender/imbuf/intern/iris.c index 8f98f240053..ea5acf27e99 100644 --- a/source/blender/imbuf/intern/iris.c +++ b/source/blender/imbuf/intern/iris.c @@ -40,7 +40,6 @@ #include "imbuf.h" #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" -#include "IMB_allocimbuf.h" #include "IMB_filetype.h" #include "IMB_colormanagement.h" diff --git a/source/blender/imbuf/intern/jp2.c b/source/blender/imbuf/intern/jp2.c index 18c096450af..8750b825fb6 100644 --- a/source/blender/imbuf/intern/jp2.c +++ b/source/blender/imbuf/intern/jp2.c @@ -29,11 +29,8 @@ #include "BLI_math.h" #include "BLI_fileops.h" -#include "imbuf.h" - #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" -#include "IMB_allocimbuf.h" #include "IMB_filetype.h" #include "IMB_colormanagement.h" diff --git a/source/blender/imbuf/intern/png.c b/source/blender/imbuf/intern/png.c index d00a836667e..3266dc97c78 100644 --- a/source/blender/imbuf/intern/png.c +++ b/source/blender/imbuf/intern/png.c @@ -41,8 +41,6 @@ #include "MEM_guardedalloc.h" -#include "imbuf.h" - #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" diff --git a/source/blender/imbuf/intern/rectop.c b/source/blender/imbuf/intern/rectop.c index dd2406e234e..4001b681ad9 100644 --- a/source/blender/imbuf/intern/rectop.c +++ b/source/blender/imbuf/intern/rectop.c @@ -39,11 +39,9 @@ #include "BLI_math_color_blend.h" #include "BLI_math_vector.h" -#include "imbuf.h" #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" -#include "IMB_allocimbuf.h" #include "IMB_colormanagement.h" void IMB_blend_color_byte(unsigned char dst[4], unsigned char src1[4], unsigned char src2[4], IMB_BlendMode mode) diff --git a/source/blender/imbuf/intern/rotate.c b/source/blender/imbuf/intern/rotate.c index e98757883be..886944f6190 100644 --- a/source/blender/imbuf/intern/rotate.c +++ b/source/blender/imbuf/intern/rotate.c @@ -39,8 +39,6 @@ #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" -#include "IMB_allocimbuf.h" - void IMB_flipy(struct ImBuf *ibuf) { int x, y; diff --git a/source/blender/imbuf/intern/scaling.c b/source/blender/imbuf/intern/scaling.c index e480f06da2b..2601fe62c2f 100644 --- a/source/blender/imbuf/intern/scaling.c +++ b/source/blender/imbuf/intern/scaling.c @@ -33,7 +33,6 @@ #include "BLI_utildefines.h" -#include "BLI_math_base.h" #include "BLI_math_color.h" #include "BLI_math_interp.h" #include "MEM_guardedalloc.h" @@ -42,7 +41,6 @@ #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" -#include "IMB_allocimbuf.h" #include "IMB_filter.h" #include "BLI_sys_types.h" // for intptr_t support diff --git a/source/blender/imbuf/intern/targa.c b/source/blender/imbuf/intern/targa.c index 2dcb27a05d4..70b71ec4182 100644 --- a/source/blender/imbuf/intern/targa.c +++ b/source/blender/imbuf/intern/targa.c @@ -44,7 +44,6 @@ #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" -#include "IMB_allocimbuf.h" #include "IMB_filetype.h" #include "IMB_colormanagement.h" diff --git a/source/blender/imbuf/intern/thumbs_blend.c b/source/blender/imbuf/intern/thumbs_blend.c index 73ced4095f9..af353461f1f 100644 --- a/source/blender/imbuf/intern/thumbs_blend.c +++ b/source/blender/imbuf/intern/thumbs_blend.c @@ -29,8 +29,6 @@ #include "zlib.h" -#include "MEM_guardedalloc.h" - #include "BLI_utildefines.h" #include "BLI_endian_switch.h" #include "BLI_fileops.h" diff --git a/source/blender/imbuf/intern/tiff.c b/source/blender/imbuf/intern/tiff.c index eb8f94cbc6e..e3b8e271387 100644 --- a/source/blender/imbuf/intern/tiff.c +++ b/source/blender/imbuf/intern/tiff.c @@ -53,9 +53,7 @@ #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" -#include "IMB_allocimbuf.h" #include "IMB_filetype.h" -#include "IMB_filter.h" #include "IMB_colormanagement.h" #include "IMB_colormanagement_intern.h" diff --git a/source/blender/imbuf/intern/writeimage.c b/source/blender/imbuf/intern/writeimage.c index d4a9bf7dc09..087330d10d2 100644 --- a/source/blender/imbuf/intern/writeimage.c +++ b/source/blender/imbuf/intern/writeimage.c @@ -41,8 +41,6 @@ #include "IMB_colormanagement.h" #include "IMB_colormanagement_intern.h" -#include "imbuf.h" - static ImBuf *prepare_write_imbuf(ImFileType *type, ImBuf *ibuf) { ImBuf *write_ibuf = ibuf; diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c index ca9ff499801..d45771c77d8 100644 --- a/source/blender/makesrna/intern/makesrna.c +++ b/source/blender/makesrna/intern/makesrna.c @@ -35,7 +35,6 @@ #include "BLI_utildefines.h" -#include "RNA_access.h" #include "RNA_define.h" #include "RNA_types.h" diff --git a/source/blender/modifiers/intern/MOD_boolean.c b/source/blender/modifiers/intern/MOD_boolean.c index 49c0c091dee..22636e7c4d0 100644 --- a/source/blender/modifiers/intern/MOD_boolean.c +++ b/source/blender/modifiers/intern/MOD_boolean.c @@ -39,8 +39,6 @@ #include "BLI_utildefines.h" -#include "BLF_translation.h" - #include "BKE_cdderivedmesh.h" #include "BKE_modifier.h" @@ -49,8 +47,6 @@ #include "MOD_boolean_util.h" #include "MOD_util.h" -#include "PIL_time.h" - static void copyData(ModifierData *md, ModifierData *target) { #if 0 diff --git a/source/blender/modifiers/intern/MOD_build.c b/source/blender/modifiers/intern/MOD_build.c index f6ade2bf303..077bcaf9940 100644 --- a/source/blender/modifiers/intern/MOD_build.c +++ b/source/blender/modifiers/intern/MOD_build.c @@ -40,17 +40,13 @@ #include "BLI_math_vector.h" #include "BLI_ghash.h" -#include "DNA_scene_types.h" #include "DNA_meshdata_types.h" #include "BKE_cdderivedmesh.h" -#include "BKE_mesh.h" #include "BKE_modifier.h" #include "BKE_particle.h" #include "BKE_scene.h" -#include "MOD_util.h" - static void initData(ModifierData *md) { BuildModifierData *bmd = (BuildModifierData *) md; diff --git a/source/blender/modifiers/intern/MOD_collision.c b/source/blender/modifiers/intern/MOD_collision.c index 8f6c533ae4c..130e332ef69 100644 --- a/source/blender/modifiers/intern/MOD_collision.c +++ b/source/blender/modifiers/intern/MOD_collision.c @@ -32,7 +32,6 @@ * \ingroup modifiers */ - #include "DNA_object_types.h" #include "DNA_meshdata_types.h" @@ -49,8 +48,6 @@ #include "BKE_pointcache.h" #include "BKE_scene.h" -#include "MOD_util.h" - static void initData(ModifierData *md) { CollisionModifierData *collmd = (CollisionModifierData *) md; diff --git a/source/blender/modifiers/intern/MOD_curve.c b/source/blender/modifiers/intern/MOD_curve.c index fbc72cef0e8..9c3ccf033a5 100644 --- a/source/blender/modifiers/intern/MOD_curve.c +++ b/source/blender/modifiers/intern/MOD_curve.c @@ -32,7 +32,6 @@ * \ingroup modifiers */ - #include <string.h> #include "DNA_scene_types.h" @@ -47,7 +46,6 @@ #include "depsgraph_private.h" -#include "MOD_util.h" static void initData(ModifierData *md) { diff --git a/source/blender/modifiers/intern/MOD_decimate.c b/source/blender/modifiers/intern/MOD_decimate.c index b844b9e3bde..8a92deec8eb 100644 --- a/source/blender/modifiers/intern/MOD_decimate.c +++ b/source/blender/modifiers/intern/MOD_decimate.c @@ -35,17 +35,12 @@ #include "DNA_object_types.h" #include "BLI_math.h" -#include "BLI_string.h" #include "BLI_utildefines.h" -#include "BLF_translation.h" - #include "MEM_guardedalloc.h" -#include "BKE_mesh.h" #include "BKE_modifier.h" #include "BKE_deform.h" -#include "BKE_particle.h" #include "BKE_cdderivedmesh.h" #include "bmesh.h" diff --git a/source/blender/modifiers/intern/MOD_dynamicpaint.c b/source/blender/modifiers/intern/MOD_dynamicpaint.c index 838ceb5cfe0..5236365da70 100644 --- a/source/blender/modifiers/intern/MOD_dynamicpaint.c +++ b/source/blender/modifiers/intern/MOD_dynamicpaint.c @@ -28,7 +28,6 @@ #include <stddef.h> #include "DNA_dynamicpaint_types.h" -#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" @@ -40,8 +39,6 @@ #include "depsgraph_private.h" -#include "MOD_util.h" - static void initData(ModifierData *md) { diff --git a/source/blender/modifiers/intern/MOD_explode.c b/source/blender/modifiers/intern/MOD_explode.c index d3c7e7d4779..86e9dc7dc25 100644 --- a/source/blender/modifiers/intern/MOD_explode.c +++ b/source/blender/modifiers/intern/MOD_explode.c @@ -54,7 +54,6 @@ #include "MEM_guardedalloc.h" -#include "MOD_util.h" static void initData(ModifierData *md) { diff --git a/source/blender/modifiers/intern/MOD_fluidsim.c b/source/blender/modifiers/intern/MOD_fluidsim.c index d3c56b8d7f7..9c973cd0d50 100644 --- a/source/blender/modifiers/intern/MOD_fluidsim.c +++ b/source/blender/modifiers/intern/MOD_fluidsim.c @@ -45,7 +45,6 @@ #include "depsgraph_private.h" -#include "MOD_util.h" #include "MOD_fluidsim_util.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/modifiers/intern/MOD_laplaciansmooth.c b/source/blender/modifiers/intern/MOD_laplaciansmooth.c index 192e557a6be..6f33bfa73fc 100644 --- a/source/blender/modifiers/intern/MOD_laplaciansmooth.c +++ b/source/blender/modifiers/intern/MOD_laplaciansmooth.c @@ -41,7 +41,6 @@ #include "BKE_deform.h" #include "BKE_modifier.h" -#include "MOD_modifiertypes.h" #include "MOD_util.h" #ifdef WITH_OPENNL diff --git a/source/blender/modifiers/intern/MOD_lattice.c b/source/blender/modifiers/intern/MOD_lattice.c index e4a359a93e2..86687865d02 100644 --- a/source/blender/modifiers/intern/MOD_lattice.c +++ b/source/blender/modifiers/intern/MOD_lattice.c @@ -38,7 +38,6 @@ #include "DNA_object_types.h" #include "BLI_utildefines.h" -#include "BLI_string.h" #include "BKE_cdderivedmesh.h" #include "BKE_lattice.h" diff --git a/source/blender/modifiers/intern/MOD_mask.c b/source/blender/modifiers/intern/MOD_mask.c index 5cb9feb4fac..254ca0bda08 100644 --- a/source/blender/modifiers/intern/MOD_mask.c +++ b/source/blender/modifiers/intern/MOD_mask.c @@ -51,8 +51,6 @@ #include "depsgraph_private.h" -#include "MOD_util.h" - static void copyData(ModifierData *md, ModifierData *target) { #if 0 diff --git a/source/blender/modifiers/intern/MOD_meshcache.c b/source/blender/modifiers/intern/MOD_meshcache.c index 925d9691892..db50d49f790 100644 --- a/source/blender/modifiers/intern/MOD_meshcache.c +++ b/source/blender/modifiers/intern/MOD_meshcache.c @@ -48,8 +48,6 @@ #include "MOD_modifiertypes.h" -#include "MOD_util.h" - static void initData(ModifierData *md) { MeshCacheModifierData *mcmd = (MeshCacheModifierData *)md; diff --git a/source/blender/modifiers/intern/MOD_meshcache_pc2.c b/source/blender/modifiers/intern/MOD_meshcache_pc2.c index 3ef0ee54886..679bdcd1d47 100644 --- a/source/blender/modifiers/intern/MOD_meshcache_pc2.c +++ b/source/blender/modifiers/intern/MOD_meshcache_pc2.c @@ -31,7 +31,6 @@ #include "BLI_sys_types.h" #include "BLI_utildefines.h" #include "BLI_fileops.h" -#include "BLI_math.h" #ifdef __BIG_ENDIAN__ # include "BLI_endian_switch.h" #endif diff --git a/source/blender/modifiers/intern/MOD_meshdeform.c b/source/blender/modifiers/intern/MOD_meshdeform.c index c6756f21af0..584b5b5fc76 100644 --- a/source/blender/modifiers/intern/MOD_meshdeform.c +++ b/source/blender/modifiers/intern/MOD_meshdeform.c @@ -40,8 +40,6 @@ #include "BLI_task.h" #include "BLI_utildefines.h" -#include "BLF_translation.h" - #include "BKE_cdderivedmesh.h" #include "BKE_global.h" #include "BKE_modifier.h" diff --git a/source/blender/modifiers/intern/MOD_mirror.c b/source/blender/modifiers/intern/MOD_mirror.c index 5de4a76dcbe..7a7308639f5 100644 --- a/source/blender/modifiers/intern/MOD_mirror.c +++ b/source/blender/modifiers/intern/MOD_mirror.c @@ -42,8 +42,6 @@ #include "BKE_modifier.h" #include "BKE_deform.h" -#include "bmesh.h" - #include "MEM_guardedalloc.h" #include "depsgraph_private.h" diff --git a/source/blender/modifiers/intern/MOD_multires.c b/source/blender/modifiers/intern/MOD_multires.c index deae10b5bcb..4754813a744 100644 --- a/source/blender/modifiers/intern/MOD_multires.c +++ b/source/blender/modifiers/intern/MOD_multires.c @@ -44,11 +44,8 @@ #include "BKE_mesh.h" #include "BKE_multires.h" #include "BKE_modifier.h" -#include "BKE_paint.h" #include "BKE_subsurf.h" -#include "MOD_util.h" - static void initData(ModifierData *md) { MultiresModifierData *mmd = (MultiresModifierData *)md; diff --git a/source/blender/modifiers/intern/MOD_ocean.c b/source/blender/modifiers/intern/MOD_ocean.c index a324702a6ae..1c8dcdff46d 100644 --- a/source/blender/modifiers/intern/MOD_ocean.c +++ b/source/blender/modifiers/intern/MOD_ocean.c @@ -43,8 +43,6 @@ #include "BKE_modifier.h" #include "BKE_ocean.h" -#include "MOD_util.h" - #ifdef WITH_OCEANSIM static void init_cache_data(Object *ob, struct OceanModifierData *omd) { diff --git a/source/blender/modifiers/intern/MOD_particleinstance.c b/source/blender/modifiers/intern/MOD_particleinstance.c index 7aa81d6a003..768bed19102 100644 --- a/source/blender/modifiers/intern/MOD_particleinstance.c +++ b/source/blender/modifiers/intern/MOD_particleinstance.c @@ -48,8 +48,6 @@ #include "BKE_particle.h" #include "BKE_pointcache.h" -#include "MOD_util.h" - #include "depsgraph_private.h" diff --git a/source/blender/modifiers/intern/MOD_shrinkwrap.c b/source/blender/modifiers/intern/MOD_shrinkwrap.c index 229f4911ab4..302013b9b07 100644 --- a/source/blender/modifiers/intern/MOD_shrinkwrap.c +++ b/source/blender/modifiers/intern/MOD_shrinkwrap.c @@ -38,7 +38,6 @@ #include "DNA_object_types.h" #include "BLI_math.h" -#include "BLI_string.h" #include "BLI_utildefines.h" #include "BKE_cdderivedmesh.h" diff --git a/source/blender/modifiers/intern/MOD_skin.c b/source/blender/modifiers/intern/MOD_skin.c index bc8d86ac78f..64f10e5036f 100644 --- a/source/blender/modifiers/intern/MOD_skin.c +++ b/source/blender/modifiers/intern/MOD_skin.c @@ -79,8 +79,6 @@ #include "bmesh.h" -#include "MOD_util.h" - typedef struct { float mat[3][3]; /* Vert that edge is pointing away from, no relation to diff --git a/source/blender/modifiers/intern/MOD_smoke.c b/source/blender/modifiers/intern/MOD_smoke.c index fcd4cc96410..f260c0491ee 100644 --- a/source/blender/modifiers/intern/MOD_smoke.c +++ b/source/blender/modifiers/intern/MOD_smoke.c @@ -52,9 +52,6 @@ #include "depsgraph_private.h" -#include "MOD_util.h" - - static void initData(ModifierData *md) { SmokeModifierData *smd = (SmokeModifierData *) md; diff --git a/source/blender/modifiers/intern/MOD_triangulate.c b/source/blender/modifiers/intern/MOD_triangulate.c index 4cae3d662db..592ab4194ec 100644 --- a/source/blender/modifiers/intern/MOD_triangulate.c +++ b/source/blender/modifiers/intern/MOD_triangulate.c @@ -31,7 +31,6 @@ #include "BKE_cdderivedmesh.h" #include "BKE_modifier.h" -#include "BKE_editmesh.h" #include "bmesh.h" #include "bmesh_tools.h" diff --git a/source/blender/modifiers/intern/MOD_util.c b/source/blender/modifiers/intern/MOD_util.c index 829c2b88995..8c62a0ba816 100644 --- a/source/blender/modifiers/intern/MOD_util.c +++ b/source/blender/modifiers/intern/MOD_util.c @@ -32,7 +32,6 @@ #include <string.h> -#include "DNA_curve_types.h" #include "DNA_image_types.h" #include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" @@ -48,8 +47,6 @@ #include "BKE_image.h" #include "BKE_lattice.h" #include "BKE_mesh.h" -#include "BKE_displist.h" -#include "BKE_scene.h" #include "BKE_modifier.h" @@ -58,8 +55,6 @@ #include "MEM_guardedalloc.h" -#include "RE_shader_ext.h" - #ifdef OPENNL_THREADING_HACK #include "BLI_threads.h" #endif diff --git a/source/blender/modifiers/intern/MOD_uvproject.c b/source/blender/modifiers/intern/MOD_uvproject.c index 2ff93efdb86..75a074a245a 100644 --- a/source/blender/modifiers/intern/MOD_uvproject.c +++ b/source/blender/modifiers/intern/MOD_uvproject.c @@ -49,7 +49,6 @@ #include "BKE_DerivedMesh.h" #include "MOD_modifiertypes.h" -#include "MOD_util.h" #include "MEM_guardedalloc.h" #include "depsgraph_private.h" diff --git a/source/blender/modifiers/intern/MOD_weightvg_util.c b/source/blender/modifiers/intern/MOD_weightvg_util.c index 744b6b62c2a..7e1c402007b 100644 --- a/source/blender/modifiers/intern/MOD_weightvg_util.c +++ b/source/blender/modifiers/intern/MOD_weightvg_util.c @@ -34,7 +34,6 @@ #include "BLI_utildefines.h" #include "DNA_color_types.h" /* CurveMapping. */ -#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" #include "DNA_object_types.h" @@ -43,11 +42,9 @@ #include "BKE_cdderivedmesh.h" #include "BKE_colortools.h" /* CurveMapping. */ #include "BKE_deform.h" -#include "BKE_mesh.h" #include "BKE_modifier.h" #include "BKE_texture.h" /* Texture masking. */ -#include "depsgraph_private.h" #include "MEM_guardedalloc.h" #include "MOD_util.h" #include "MOD_weightvg_util.h" diff --git a/source/blender/modifiers/intern/MOD_weightvgedit.c b/source/blender/modifiers/intern/MOD_weightvgedit.c index f36abcceae0..5a6e958457e 100644 --- a/source/blender/modifiers/intern/MOD_weightvgedit.c +++ b/source/blender/modifiers/intern/MOD_weightvgedit.c @@ -34,7 +34,6 @@ #include "BLI_rand.h" #include "DNA_color_types.h" /* CurveMapping. */ -#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" #include "DNA_object_types.h" @@ -48,7 +47,6 @@ #include "depsgraph_private.h" #include "MEM_guardedalloc.h" -#include "MOD_util.h" #include "MOD_weightvg_util.h" /************************************** diff --git a/source/blender/modifiers/intern/MOD_weightvgmix.c b/source/blender/modifiers/intern/MOD_weightvgmix.c index bdc1099d682..099d4c7116e 100644 --- a/source/blender/modifiers/intern/MOD_weightvgmix.c +++ b/source/blender/modifiers/intern/MOD_weightvgmix.c @@ -44,7 +44,6 @@ #include "depsgraph_private.h" #include "MEM_guardedalloc.h" -#include "MOD_util.h" #include "MOD_weightvg_util.h" diff --git a/source/blender/modifiers/intern/MOD_weightvgproximity.c b/source/blender/modifiers/intern/MOD_weightvgproximity.c index 71d4742980e..766ffe529ab 100644 --- a/source/blender/modifiers/intern/MOD_weightvgproximity.c +++ b/source/blender/modifiers/intern/MOD_weightvgproximity.c @@ -47,7 +47,6 @@ #include "depsgraph_private.h" #include "MEM_guardedalloc.h" -#include "MOD_util.h" #include "MOD_weightvg_util.h" // #define USE_TIMEIT diff --git a/source/blender/modifiers/intern/MOD_wireframe.c b/source/blender/modifiers/intern/MOD_wireframe.c index 7349ca9f9ef..8b611f9e6da 100644 --- a/source/blender/modifiers/intern/MOD_wireframe.c +++ b/source/blender/modifiers/intern/MOD_wireframe.c @@ -23,20 +23,14 @@ * \ingroup modifiers */ -#include "MEM_guardedalloc.h" - #include "DNA_object_types.h" -#include "DNA_meshdata_types.h" -#include "BLI_math.h" #include "BLI_utildefines.h" -#include "BLI_string.h" #include "BKE_cdderivedmesh.h" #include "BKE_deform.h" #include "MOD_modifiertypes.h" -#include "MOD_util.h" #include "bmesh.h" #include "tools/bmesh_wireframe.h" diff --git a/source/blender/nodes/composite/node_composite_tree.c b/source/blender/nodes/composite/node_composite_tree.c index 1883b084ce1..e616680647e 100644 --- a/source/blender/nodes/composite/node_composite_tree.c +++ b/source/blender/nodes/composite/node_composite_tree.c @@ -36,11 +36,8 @@ #include "DNA_scene_types.h" #include "DNA_node_types.h" -#include "BLI_listbase.h" - #include "BLF_translation.h" -#include "BKE_colortools.h" #include "BKE_context.h" #include "BKE_global.h" #include "BKE_main.h" @@ -50,8 +47,6 @@ #include "node_common.h" #include "node_util.h" -#include "PIL_time.h" - #include "RNA_access.h" #include "NOD_composite.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_common.c b/source/blender/nodes/composite/nodes/node_composite_common.c index 36c12693bdf..75e7fa8fbac 100644 --- a/source/blender/nodes/composite/nodes/node_composite_common.c +++ b/source/blender/nodes/composite/nodes/node_composite_common.c @@ -35,7 +35,6 @@ #include "node_composite_util.h" #include "NOD_common.h" #include "node_common.h" -#include "node_exec.h" #include "BKE_node.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_composite.c b/source/blender/nodes/composite/nodes/node_composite_composite.c index 41d417c2cb4..be9ed457150 100644 --- a/source/blender/nodes/composite/nodes/node_composite_composite.c +++ b/source/blender/nodes/composite/nodes/node_composite_composite.c @@ -31,10 +31,6 @@ #include "node_composite_util.h" -#include "BKE_context.h" - -#include "RNA_access.h" - /* **************** COMPOSITE ******************** */ static bNodeSocketTemplate cmp_node_composite_in[] = { { SOCK_RGBA, 1, N_("Image"), 0.0f, 0.0f, 0.0f, 1.0f}, diff --git a/source/blender/nodes/composite/nodes/node_composite_defocus.c b/source/blender/nodes/composite/nodes/node_composite_defocus.c index ef670b760c2..a3311755717 100644 --- a/source/blender/nodes/composite/nodes/node_composite_defocus.c +++ b/source/blender/nodes/composite/nodes/node_composite_defocus.c @@ -33,10 +33,6 @@ #include <limits.h> -#include "BKE_context.h" - -#include "RNA_access.h" - /* ************ qdn: Defocus node ****************** */ static bNodeSocketTemplate cmp_node_defocus_in[] = { { SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f}, diff --git a/source/blender/nodes/composite/nodes/node_composite_image.c b/source/blender/nodes/composite/nodes/node_composite_image.c index 659e582dc1d..ecc02e732ce 100644 --- a/source/blender/nodes/composite/nodes/node_composite_image.c +++ b/source/blender/nodes/composite/nodes/node_composite_image.c @@ -39,8 +39,6 @@ #include "BKE_global.h" #include "BKE_main.h" -#include "RNA_access.h" - /* **************** IMAGE (and RenderResult, multilayer image) ******************** */ static bNodeSocketTemplate cmp_node_rlayers_out[] = { diff --git a/source/blender/nodes/composite/nodes/node_composite_keying.c b/source/blender/nodes/composite/nodes/node_composite_keying.c index 6b5def1ea93..ba179bcbcd3 100644 --- a/source/blender/nodes/composite/nodes/node_composite_keying.c +++ b/source/blender/nodes/composite/nodes/node_composite_keying.c @@ -34,12 +34,8 @@ #include "DNA_movieclip_types.h" -#include "BKE_movieclip.h" - -#include "BLI_listbase.h" #include "BLI_math_base.h" #include "BLI_math_color.h" -#include "BLI_voronoi.h" #include "node_composite_util.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_keyingscreen.c b/source/blender/nodes/composite/nodes/node_composite_keyingscreen.c index 9965b55e088..0cdf15c0412 100644 --- a/source/blender/nodes/composite/nodes/node_composite_keyingscreen.c +++ b/source/blender/nodes/composite/nodes/node_composite_keyingscreen.c @@ -30,16 +30,10 @@ * \ingroup cmpnodes */ -#include "BLF_translation.h" - #include "DNA_movieclip_types.h" -#include "BKE_movieclip.h" - -#include "BLI_listbase.h" #include "BLI_math_base.h" #include "BLI_math_color.h" -#include "BLI_voronoi.h" #include "node_composite_util.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_mask.c b/source/blender/nodes/composite/nodes/node_composite_mask.c index 83cea47db1b..dd05d5d83ad 100644 --- a/source/blender/nodes/composite/nodes/node_composite_mask.c +++ b/source/blender/nodes/composite/nodes/node_composite_mask.c @@ -30,12 +30,8 @@ * \ingroup cmpnodes */ -#include "BLF_translation.h" - #include "DNA_mask_types.h" -#include "BKE_mask.h" - #include "node_composite_util.h" /* **************** Translate ******************** */ diff --git a/source/blender/nodes/composite/nodes/node_composite_movieclip.c b/source/blender/nodes/composite/nodes/node_composite_movieclip.c index fc0d8060644..0fece9dd4f6 100644 --- a/source/blender/nodes/composite/nodes/node_composite_movieclip.c +++ b/source/blender/nodes/composite/nodes/node_composite_movieclip.c @@ -30,13 +30,10 @@ * \ingroup cmpnodes */ - #include "node_composite_util.h" #include "BKE_context.h" -#include "RNA_access.h" - static bNodeSocketTemplate cmp_node_movieclip_out[] = { { SOCK_RGBA, 0, N_("Image")}, { SOCK_FLOAT, 0, N_("Alpha")}, diff --git a/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c b/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c index 1d411aafe68..9c54009d2f1 100644 --- a/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c +++ b/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c @@ -34,8 +34,6 @@ #include "BKE_context.h" -#include "RNA_access.h" - /* **************** Translate ******************** */ static bNodeSocketTemplate cmp_node_moviedistortion_in[] = { diff --git a/source/blender/nodes/composite/nodes/node_composite_outputFile.c b/source/blender/nodes/composite/nodes/node_composite_outputFile.c index 57c39b082b4..8e602c6179c 100644 --- a/source/blender/nodes/composite/nodes/node_composite_outputFile.c +++ b/source/blender/nodes/composite/nodes/node_composite_outputFile.c @@ -40,9 +40,6 @@ #include "node_composite_util.h" -#include "IMB_imbuf.h" -#include "IMB_imbuf_types.h" - #include "intern/openexr/openexr_multi.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c b/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c index 28e2a2a205b..00791c278ae 100644 --- a/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c +++ b/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c @@ -30,13 +30,10 @@ * \ingroup cmpnodes */ - #include "node_composite_util.h" #include "BKE_context.h" -#include "RNA_access.h" - /* **************** Translate ******************** */ static bNodeSocketTemplate cmp_node_stabilize2d_in[] = { diff --git a/source/blender/nodes/intern/node_common.c b/source/blender/nodes/intern/node_common.c index c58c9c902ec..0e250dc3aa4 100644 --- a/source/blender/nodes/intern/node_common.c +++ b/source/blender/nodes/intern/node_common.c @@ -29,7 +29,6 @@ * \ingroup nodes */ - #include <string.h> #include <stddef.h> @@ -43,15 +42,12 @@ #include "BKE_node.h" -#include "RNA_access.h" #include "RNA_types.h" #include "MEM_guardedalloc.h" #include "node_common.h" #include "node_util.h" -#include "node_exec.h" -#include "NOD_socket.h" #include "NOD_common.h" diff --git a/source/blender/nodes/intern/node_socket.c b/source/blender/nodes/intern/node_socket.c index 2ac1a2c85f3..282567b797f 100644 --- a/source/blender/nodes/intern/node_socket.c +++ b/source/blender/nodes/intern/node_socket.c @@ -41,7 +41,6 @@ #include "BKE_node.h" #include "RNA_access.h" -#include "RNA_define.h" #include "RNA_types.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/nodes/shader/node_shader_tree.c b/source/blender/nodes/shader/node_shader_tree.c index bea1d0532e8..f18ee1d649f 100644 --- a/source/blender/nodes/shader/node_shader_tree.c +++ b/source/blender/nodes/shader/node_shader_tree.c @@ -41,16 +41,13 @@ #include "DNA_linestyle_types.h" #include "BLI_listbase.h" -#include "BLI_math.h" #include "BLI_threads.h" #include "BLI_utildefines.h" #include "BLF_translation.h" #include "BKE_context.h" -#include "BKE_global.h" #include "BKE_linestyle.h" -#include "BKE_main.h" #include "BKE_node.h" #include "BKE_scene.h" diff --git a/source/blender/nodes/shader/nodes/node_shader_script.c b/source/blender/nodes/shader/nodes/node_shader_script.c index d5ed38297da..f640dd5ea13 100644 --- a/source/blender/nodes/shader/nodes/node_shader_script.c +++ b/source/blender/nodes/shader/nodes/node_shader_script.c @@ -31,8 +31,6 @@ #include "node_shader_util.h" -#include "BKE_idprop.h" - /* **************** Script ******************** */ static void init(bNodeTree *UNUSED(ntree), bNode *node) diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_environment.c b/source/blender/nodes/shader/nodes/node_shader_tex_environment.c index f6361331741..8d6a77455bb 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_environment.c +++ b/source/blender/nodes/shader/nodes/node_shader_tex_environment.c @@ -27,8 +27,6 @@ #include "../node_shader_util.h" -#include "IMB_colormanagement.h" - /* **************** OUTPUT ******************** */ static bNodeSocketTemplate sh_node_tex_environment_in[] = { diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_image.c b/source/blender/nodes/shader/nodes/node_shader_tex_image.c index 0a11ee4a9b6..62db5b70891 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_image.c +++ b/source/blender/nodes/shader/nodes/node_shader_tex_image.c @@ -27,8 +27,6 @@ #include "../node_shader_util.h" -#include "IMB_colormanagement.h" - /* **************** OUTPUT ******************** */ static bNodeSocketTemplate sh_node_tex_image_in[] = { diff --git a/source/blender/nodes/shader/nodes/node_shader_texture.c b/source/blender/nodes/shader/nodes/node_shader_texture.c index d02d72563ba..5cdbaf444f8 100644 --- a/source/blender/nodes/shader/nodes/node_shader_texture.c +++ b/source/blender/nodes/shader/nodes/node_shader_texture.c @@ -29,11 +29,8 @@ * \ingroup shdnodes */ - #include "DNA_texture_types.h" -#include "IMB_colormanagement.h" - #include "node_shader_util.h" /* **************** TEXTURE ******************** */ diff --git a/source/blender/nodes/shader/nodes/node_shader_uvAlongStroke.c b/source/blender/nodes/shader/nodes/node_shader_uvAlongStroke.c index 48eb4cadba4..67342e1e836 100644 --- a/source/blender/nodes/shader/nodes/node_shader_uvAlongStroke.c +++ b/source/blender/nodes/shader/nodes/node_shader_uvAlongStroke.c @@ -27,8 +27,6 @@ #include "../node_shader_util.h" -#include "DNA_customdata_types.h" - /* **************** OUTPUT ******************** */ static bNodeSocketTemplate sh_node_uvalongstroke_out[] = { diff --git a/source/blender/nodes/texture/node_texture_tree.c b/source/blender/nodes/texture/node_texture_tree.c index 1b790f87faf..79923c5f7d5 100644 --- a/source/blender/nodes/texture/node_texture_tree.c +++ b/source/blender/nodes/texture/node_texture_tree.c @@ -43,9 +43,7 @@ #include "BLF_translation.h" #include "BKE_context.h" -#include "BKE_global.h" #include "BKE_linestyle.h" -#include "BKE_main.h" #include "BKE_node.h" #include "BKE_paint.h" @@ -57,7 +55,6 @@ #include "RNA_access.h" -#include "RE_pipeline.h" #include "RE_shader_ext.h" diff --git a/source/blender/python/bmesh/bmesh_py_ops.c b/source/blender/python/bmesh/bmesh_py_ops.c index 4fc0160bbd6..b117188987f 100644 --- a/source/blender/python/bmesh/bmesh_py_ops.c +++ b/source/blender/python/bmesh/bmesh_py_ops.c @@ -44,10 +44,6 @@ #include "bmesh_py_ops_call.h" #include "bmesh_py_ops.h" /* own include */ -#include "bmesh_py_types.h" - -#include "bmesh_py_utils.h" - /* bmesh operator 'bmesh.ops.*' callable types * ******************************************* */ static PyTypeObject bmesh_op_Type; diff --git a/source/blender/python/bmesh/bmesh_py_ops_call.c b/source/blender/python/bmesh/bmesh_py_ops_call.c index 2c07df98973..ec6810fe49a 100644 --- a/source/blender/python/bmesh/bmesh_py_ops_call.c +++ b/source/blender/python/bmesh/bmesh_py_ops_call.c @@ -39,11 +39,9 @@ #include "bmesh.h" -#include "bmesh_py_ops.h" #include "bmesh_py_ops_call.h" /* own include */ #include "bmesh_py_types.h" -#include "bmesh_py_utils.h" static int bpy_bm_op_as_py_error(BMesh *bm) { diff --git a/source/blender/python/bmesh/bmesh_py_types_select.c b/source/blender/python/bmesh/bmesh_py_types_select.c index 11184b95a9c..6dd0ec5be0b 100644 --- a/source/blender/python/bmesh/bmesh_py_types_select.c +++ b/source/blender/python/bmesh/bmesh_py_types_select.c @@ -45,8 +45,6 @@ #include "../generic/py_capi_utils.h" -#include "bmesh_py_api.h" /* own include */ - PyDoc_STRVAR(bpy_bmeditselseq_active_doc, "The last selected element or None (read-only).\n\n:type: :class:`BMVert`, :class:`BMEdge` or :class:`BMFace`" ); diff --git a/source/blender/python/intern/bpy.c b/source/blender/python/intern/bpy.c index 0ec7bc73390..5eb8c7c9967 100644 --- a/source/blender/python/intern/bpy.c +++ b/source/blender/python/intern/bpy.c @@ -34,7 +34,6 @@ #include "BLI_string.h" #include "BKE_appdir.h" -#include "BKE_main.h" #include "BKE_global.h" /* XXX, G.main only */ #include "BKE_blender.h" #include "BKE_bpath.h" @@ -53,8 +52,6 @@ #include "../generic/py_capi_utils.h" -#include "MEM_guardedalloc.h" - /* external util modules */ #include "../generic/idprop_py_api.h" #include "../generic/bgl.h" diff --git a/source/blender/python/intern/bpy_app.c b/source/blender/python/intern/bpy_app.c index 7e943b2f4bf..25f855d06b2 100644 --- a/source/blender/python/intern/bpy_app.c +++ b/source/blender/python/intern/bpy_app.c @@ -44,12 +44,10 @@ #include "bpy_driver.h" #include "BLI_utildefines.h" -#include "BLI_path_util.h" #include "BKE_appdir.h" #include "BKE_blender.h" #include "BKE_global.h" -#include "structseq.h" #include "../generic/py_capi_utils.h" diff --git a/source/blender/python/intern/bpy_app_translations.c b/source/blender/python/intern/bpy_app_translations.c index 0114e8e65e4..6d0161c2047 100644 --- a/source/blender/python/intern/bpy_app_translations.c +++ b/source/blender/python/intern/bpy_app_translations.c @@ -44,7 +44,6 @@ #include "BLF_translation.h" #include "RNA_types.h" -#include "RNA_access.h" typedef struct diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c index f6e97d6a2d8..b06907b6208 100644 --- a/source/blender/python/intern/bpy_rna.c +++ b/source/blender/python/intern/bpy_rna.c @@ -77,10 +77,6 @@ #include "../generic/idprop_py_api.h" /* for IDprop lookups */ #include "../generic/py_capi_utils.h" -#ifdef WITH_INTERNATIONAL -# include "BLF_translation.h" -#endif - #define USE_PEDANTIC_WRITE #define USE_MATHUTILS #define USE_STRING_COERCE diff --git a/source/blender/python/intern/bpy_utils_units.c b/source/blender/python/intern/bpy_utils_units.c index cdbd57bcebe..a6df8f54cc3 100644 --- a/source/blender/python/intern/bpy_utils_units.c +++ b/source/blender/python/intern/bpy_utils_units.c @@ -35,9 +35,7 @@ #include "BLI_utildefines.h" #include "BLI_string.h" -#include "BLI_ghash.h" -#include "BPY_extern.h" #include "bpy_utils_units.h" #include "../generic/py_capi_utils.h" diff --git a/source/blender/python/intern/gpu.c b/source/blender/python/intern/gpu.c index 1002293ee0a..e4580e8035b 100644 --- a/source/blender/python/intern/gpu.c +++ b/source/blender/python/intern/gpu.c @@ -40,7 +40,6 @@ #include <Python.h> #include "DNA_scene_types.h" -#include "DNA_image_types.h" #include "DNA_material_types.h" #include "DNA_ID.h" #include "DNA_customdata_types.h" diff --git a/source/blender/python/mathutils/mathutils_noise.c b/source/blender/python/mathutils/mathutils_noise.c index 8dfa7904300..f0837c4ec0a 100644 --- a/source/blender/python/mathutils/mathutils_noise.c +++ b/source/blender/python/mathutils/mathutils_noise.c @@ -34,8 +34,6 @@ #include <Python.h> -#include "structseq.h" - #include "BLI_math.h" #include "BLI_noise.h" #include "BLI_utildefines.h" diff --git a/source/blender/render/intern/source/bake.c b/source/blender/render/intern/source/bake.c index 9b22c7d8bad..dfec286e4ab 100644 --- a/source/blender/render/intern/source/bake.c +++ b/source/blender/render/intern/source/bake.c @@ -54,8 +54,6 @@ #include "IMB_imbuf.h" #include "IMB_colormanagement.h" -#include "RE_bake.h" - /* local include */ #include "rayintersection.h" #include "rayobject.h" diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index c732aa4664b..b0800c2c27b 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -82,9 +82,7 @@ #include "BKE_particle.h" #include "BKE_scene.h" - #include "PIL_time.h" -#include "IMB_imbuf_types.h" #include "envmap.h" #include "occlusion.h" @@ -103,8 +101,6 @@ #include "zbuf.h" #include "sunsky.h" -#include "RE_render_ext.h" - /* 10 times larger than normal epsilon, test it on default nurbs sphere with ray_transp (for quad detection) */ /* or for checking vertex normal flips */ #define FLT_EPSILON10 1.19209290e-06F diff --git a/source/blender/render/intern/source/envmap.c b/source/blender/render/intern/source/envmap.c index 06be00a5a5e..c3c70067836 100644 --- a/source/blender/render/intern/source/envmap.c +++ b/source/blender/render/intern/source/envmap.c @@ -55,14 +55,10 @@ /* this module */ #include "render_types.h" -#include "renderpipeline.h" #include "envmap.h" -#include "rendercore.h" #include "renderdatabase.h" #include "texture.h" #include "zbuf.h" -#include "initrender.h" - /* ------------------------------------------------------------------------- */ diff --git a/source/blender/render/intern/source/external_engine.c b/source/blender/render/intern/source/external_engine.c index 54f142184e1..8a15c5e86a7 100644 --- a/source/blender/render/intern/source/external_engine.c +++ b/source/blender/render/intern/source/external_engine.c @@ -46,9 +46,6 @@ #include "BKE_report.h" #include "BKE_scene.h" -#include "IMB_imbuf.h" -#include "IMB_imbuf_types.h" - #include "RNA_access.h" #ifdef WITH_PYTHON diff --git a/source/blender/render/intern/source/imagetexture.c b/source/blender/render/intern/source/imagetexture.c index 2787ce99b13..833d1a75559 100644 --- a/source/blender/render/intern/source/imagetexture.c +++ b/source/blender/render/intern/source/imagetexture.c @@ -50,12 +50,10 @@ #include "BLI_threads.h" #include "BLI_utildefines.h" -#include "BKE_main.h" #include "BKE_image.h" #include "RE_render_ext.h" -#include "renderpipeline.h" #include "render_types.h" #include "texture.h" diff --git a/source/blender/render/intern/source/initrender.c b/source/blender/render/intern/source/initrender.c index 4bb5dc154a6..b5b75f47193 100644 --- a/source/blender/render/intern/source/initrender.c +++ b/source/blender/render/intern/source/initrender.c @@ -36,8 +36,6 @@ #include "MEM_guardedalloc.h" -#include "PIL_time.h" - #include "BLI_math.h" #include "BLI_blenlib.h" #include "BLI_jitter.h" @@ -48,12 +46,8 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" - #include "BKE_camera.h" -#include "IMB_imbuf_types.h" -#include "IMB_imbuf.h" - #ifdef WITH_QUICKTIME #include "quicktime_export.h" #endif @@ -62,10 +56,6 @@ #include "renderpipeline.h" #include "render_types.h" -#include "rendercore.h" -#include "pixelshading.h" -#include "zbuf.h" - /* Own includes */ #include "initrender.h" diff --git a/source/blender/render/intern/source/occlusion.c b/source/blender/render/intern/source/occlusion.c index 0c6341fe9e5..f55dde588cb 100644 --- a/source/blender/render/intern/source/occlusion.c +++ b/source/blender/render/intern/source/occlusion.c @@ -56,9 +56,7 @@ #include "render_types.h" #include "rendercore.h" #include "renderdatabase.h" -#include "pixelshading.h" #include "shading.h" -#include "zbuf.h" /* ------------------------- Declarations --------------------------- */ diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 741cfe28d17..f0c1b5a354c 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -90,7 +90,6 @@ #include "renderdatabase.h" #include "rendercore.h" #include "initrender.h" -#include "shadbuf.h" #include "pixelblending.h" #include "zbuf.h" diff --git a/source/blender/render/intern/source/pixelblending.c b/source/blender/render/intern/source/pixelblending.c index 460a6814f07..32fb196e1f3 100644 --- a/source/blender/render/intern/source/pixelblending.c +++ b/source/blender/render/intern/source/pixelblending.c @@ -38,7 +38,6 @@ /* own includes */ #include "render_types.h" -#include "renderpipeline.h" #include "pixelblending.h" /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ diff --git a/source/blender/render/intern/source/pixelshading.c b/source/blender/render/intern/source/pixelshading.c index 014df802a78..ac4a7dbdccd 100644 --- a/source/blender/render/intern/source/pixelshading.c +++ b/source/blender/render/intern/source/pixelshading.c @@ -36,8 +36,6 @@ #include "BLI_utildefines.h" /* External modules: */ -#include "IMB_imbuf_types.h" -#include "IMB_imbuf.h" #include "DNA_group_types.h" #include "DNA_material_types.h" @@ -51,14 +49,11 @@ /* own module */ #include "render_types.h" -#include "renderpipeline.h" #include "renderdatabase.h" #include "texture.h" -#include "pixelblending.h" #include "rendercore.h" #include "shadbuf.h" #include "pixelshading.h" -#include "shading.h" #include "sunsky.h" /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c index ac2e85a33b3..ff23e3788ab 100644 --- a/source/blender/render/intern/source/pointdensity.c +++ b/source/blender/render/intern/source/pointdensity.c @@ -55,7 +55,6 @@ #include "DNA_particle_types.h" #include "render_types.h" -#include "renderdatabase.h" #include "texture.h" #include "pointdensity.h" diff --git a/source/blender/render/intern/source/rayshade.c b/source/blender/render/intern/source/rayshade.c index e31e55e6baf..3575b78f95f 100644 --- a/source/blender/render/intern/source/rayshade.c +++ b/source/blender/render/intern/source/rayshade.c @@ -27,7 +27,6 @@ * \ingroup render */ - #include <stdio.h> #include <math.h> #include <string.h> @@ -50,25 +49,18 @@ #include "BKE_node.h" - -#include "PIL_time.h" - #include "render_result.h" #include "render_types.h" -#include "renderpipeline.h" #include "rendercore.h" #include "renderdatabase.h" -#include "pixelblending.h" #include "pixelshading.h" #include "shading.h" -#include "texture.h" #include "volumetric.h" #include "rayintersection.h" #include "rayobject.h" #include "raycounter.h" - #define RAY_TRA 1 #define RAY_INSIDE 2 diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/source/render_result.c index 55f3007e7f7..6bb13587cae 100644 --- a/source/blender/render/intern/source/render_result.c +++ b/source/blender/render/intern/source/render_result.c @@ -42,7 +42,6 @@ #include "BLI_path_util.h" #include "BLI_rect.h" #include "BLI_string.h" -#include "BLI_system.h" #include "BLI_threads.h" #include "BKE_image.h" diff --git a/source/blender/render/intern/source/render_texture.c b/source/blender/render/intern/source/render_texture.c index f114da9e4a4..b1e00c4a451 100644 --- a/source/blender/render/intern/source/render_texture.c +++ b/source/blender/render/intern/source/render_texture.c @@ -48,7 +48,6 @@ #include "DNA_node_types.h" #include "IMB_imbuf_types.h" -#include "IMB_imbuf.h" #include "IMB_colormanagement.h" #include "BKE_image.h" @@ -68,9 +67,7 @@ #include "envmap.h" #include "pointdensity.h" #include "voxeldata.h" -#include "renderpipeline.h" #include "render_types.h" -#include "rendercore.h" #include "shading.h" #include "texture.h" #include "texture_ocean.h" diff --git a/source/blender/render/intern/source/rendercore.c b/source/blender/render/intern/source/rendercore.c index a67140c6334..5b054005bac 100644 --- a/source/blender/render/intern/source/rendercore.c +++ b/source/blender/render/intern/source/rendercore.c @@ -50,15 +50,7 @@ #include "DNA_material_types.h" #include "DNA_group_types.h" -#include "BKE_main.h" - -#include "IMB_imbuf_types.h" -#include "IMB_imbuf.h" -#include "IMB_colormanagement.h" - /* local include */ -#include "rayintersection.h" -#include "rayobject.h" #include "renderpipeline.h" #include "render_result.h" #include "render_types.h" @@ -71,8 +63,6 @@ #include "sss.h" #include "zbuf.h" -#include "PIL_time.h" - /* own include */ #include "rendercore.h" diff --git a/source/blender/render/intern/source/renderdatabase.c b/source/blender/render/intern/source/renderdatabase.c index 803da070e15..cafdbe2b488 100644 --- a/source/blender/render/intern/source/renderdatabase.c +++ b/source/blender/render/intern/source/renderdatabase.c @@ -78,11 +78,8 @@ #include "rayintersection.h" #include "rayobject.h" -#include "renderpipeline.h" #include "render_types.h" #include "renderdatabase.h" -#include "texture.h" -#include "strand.h" #include "zbuf.h" /* ------------------------------------------------------------------------- */ diff --git a/source/blender/render/intern/source/shadbuf.c b/source/blender/render/intern/source/shadbuf.c index 9d83ff1d7e8..0bd4815fb73 100644 --- a/source/blender/render/intern/source/shadbuf.c +++ b/source/blender/render/intern/source/shadbuf.c @@ -50,7 +50,6 @@ #include "PIL_time.h" -#include "renderpipeline.h" #include "render_types.h" #include "renderdatabase.h" #include "rendercore.h" diff --git a/source/blender/render/intern/source/shadeinput.c b/source/blender/render/intern/source/shadeinput.c index 7aca6b9ac87..01055d87a38 100644 --- a/source/blender/render/intern/source/shadeinput.c +++ b/source/blender/render/intern/source/shadeinput.c @@ -46,11 +46,9 @@ /* local include */ #include "raycounter.h" -#include "renderpipeline.h" #include "render_types.h" #include "renderdatabase.h" #include "rendercore.h" -#include "shadbuf.h" #include "shading.h" #include "strand.h" #include "texture.h" diff --git a/source/blender/render/intern/source/shadeoutput.c b/source/blender/render/intern/source/shadeoutput.c index f909c585561..93e8c6a275a 100644 --- a/source/blender/render/intern/source/shadeoutput.c +++ b/source/blender/render/intern/source/shadeoutput.c @@ -47,9 +47,7 @@ /* local include */ #include "occlusion.h" -#include "renderpipeline.h" #include "render_types.h" -#include "pixelblending.h" #include "rendercore.h" #include "shadbuf.h" #include "sss.h" diff --git a/source/blender/render/intern/source/sss.c b/source/blender/render/intern/source/sss.c index 7e9003aaee7..8ea3a753283 100644 --- a/source/blender/render/intern/source/sss.c +++ b/source/blender/render/intern/source/sss.c @@ -57,7 +57,6 @@ #include "BLF_translation.h" -#include "PIL_time.h" #include "DNA_material_types.h" @@ -68,11 +67,7 @@ /* this module */ #include "render_types.h" -#include "rendercore.h" -#include "renderdatabase.h" -#include "shading.h" #include "sss.h" -#include "zbuf.h" /* Generic Multiple Scattering API */ diff --git a/source/blender/render/intern/source/strand.c b/source/blender/render/intern/source/strand.c index 485680da76f..6b52d4aa419 100644 --- a/source/blender/render/intern/source/strand.c +++ b/source/blender/render/intern/source/strand.c @@ -47,11 +47,8 @@ #include "render_types.h" -#include "initrender.h" #include "rendercore.h" #include "renderdatabase.h" -#include "renderpipeline.h" -#include "pixelblending.h" #include "shading.h" #include "strand.h" #include "zbuf.h" diff --git a/source/blender/render/intern/source/voxeldata.c b/source/blender/render/intern/source/voxeldata.c index 50b5e392b3f..f21a1e5fa9b 100644 --- a/source/blender/render/intern/source/voxeldata.c +++ b/source/blender/render/intern/source/voxeldata.c @@ -66,7 +66,6 @@ #include "render_types.h" -#include "renderdatabase.h" #include "texture.h" #include "voxeldata.h" diff --git a/source/blender/render/intern/source/zbuf.c b/source/blender/render/intern/source/zbuf.c index 87e546ef24e..9f30e34c893 100644 --- a/source/blender/render/intern/source/zbuf.c +++ b/source/blender/render/intern/source/zbuf.c @@ -63,12 +63,10 @@ #include "pixelblending.h" #include "render_result.h" #include "render_types.h" -#include "renderpipeline.h" #include "renderdatabase.h" #include "rendercore.h" #include "shadbuf.h" #include "shading.h" -#include "sss.h" #include "strand.h" /* own includes */ diff --git a/source/blender/windowmanager/intern/wm.c b/source/blender/windowmanager/intern/wm.c index 7222447ac55..a6a3c6b0a28 100644 --- a/source/blender/windowmanager/intern/wm.c +++ b/source/blender/windowmanager/intern/wm.c @@ -39,8 +39,6 @@ #include "DNA_windowmanager_types.h" -#include "GHOST_C-api.h" - #include "MEM_guardedalloc.h" #include "BLI_utildefines.h" @@ -59,7 +57,6 @@ #include "WM_types.h" #include "wm_window.h" #include "wm_event_system.h" -#include "wm_event_types.h" #include "wm_draw.h" #include "wm.h" diff --git a/source/blender/windowmanager/intern/wm_dragdrop.c b/source/blender/windowmanager/intern/wm_dragdrop.c index 145e9df7eb0..68592b44845 100644 --- a/source/blender/windowmanager/intern/wm_dragdrop.c +++ b/source/blender/windowmanager/intern/wm_dragdrop.c @@ -45,10 +45,8 @@ #include "BIF_glutil.h" #include "BKE_context.h" -#include "BKE_screen.h" #include "IMB_imbuf_types.h" -#include "IMB_imbuf.h" #include "UI_interface.h" #include "UI_interface_icons.h" @@ -58,8 +56,6 @@ #include "WM_api.h" #include "WM_types.h" #include "wm_event_system.h" -#include "wm.h" - /* ****************************************************** */ diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 42cb5f36701..cca267a9fbb 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -81,7 +81,6 @@ #include "wm_window.h" #include "wm_event_system.h" #include "wm_event_types.h" -#include "wm_draw.h" #ifndef NDEBUG # include "RNA_enum_types.h" diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index d7e0a2f228a..412d65dc5ca 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -97,8 +97,6 @@ #include "ED_view3d.h" #include "ED_util.h" -#include "RE_pipeline.h" /* only to report missing engine */ - #include "GHOST_C-api.h" #include "GHOST_Path-api.h" diff --git a/source/blender/windowmanager/intern/wm_gesture.c b/source/blender/windowmanager/intern/wm_gesture.c index 3e287a3907b..46c3909f7bf 100644 --- a/source/blender/windowmanager/intern/wm_gesture.c +++ b/source/blender/windowmanager/intern/wm_gesture.c @@ -49,7 +49,6 @@ #include "WM_types.h" #include "wm.h" -#include "wm_event_system.h" #include "wm_subwindow.h" #include "wm_draw.h" diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index 6926251634b..d090eec4de7 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -40,9 +40,6 @@ #include "MEM_guardedalloc.h" -#include "IMB_imbuf_types.h" -#include "IMB_imbuf.h" - #include "DNA_scene_types.h" #include "DNA_userdef_types.h" #include "DNA_windowmanager_types.h" @@ -111,7 +108,6 @@ #include "BLF_translation.h" #include "GPU_buffers.h" -#include "GPU_extensions.h" #include "GPU_draw.h" #include "GPU_init_exit.h" diff --git a/source/blender/windowmanager/intern/wm_jobs.c b/source/blender/windowmanager/intern/wm_jobs.c index 74c504050ae..24d8ed0f676 100644 --- a/source/blender/windowmanager/intern/wm_jobs.c +++ b/source/blender/windowmanager/intern/wm_jobs.c @@ -45,8 +45,6 @@ #include "WM_api.h" #include "WM_types.h" -#include "wm_window.h" -#include "wm_event_system.h" #include "wm_event_types.h" #include "wm.h" diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c index ff90de4b3c6..b52f3819d3f 100644 --- a/source/blender/windowmanager/intern/wm_keymap.c +++ b/source/blender/windowmanager/intern/wm_keymap.c @@ -56,7 +56,6 @@ #include "WM_api.h" #include "WM_types.h" -#include "wm_window.h" #include "wm_event_system.h" #include "wm_event_types.h" diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index f993f821e78..bed7ab0914c 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -40,7 +40,9 @@ #include <assert.h> #include <errno.h> -#include "GHOST_C-api.h" +#ifdef WIN32 +# include "GHOST_C-api.h" +#endif #include "MEM_guardedalloc.h" @@ -2904,6 +2906,8 @@ static int wm_save_as_mainfile_exec(bContext *C, wmOperator *op) (RNA_struct_find_property(op->ptr, "use_mesh_compat") && RNA_boolean_get(op->ptr, "use_mesh_compat")), G_FILE_MESH_COMPAT); +#else +# error "don't remove by accident" #endif if (wm_file_write(C, path, fileflags, op->reports) != 0) diff --git a/source/blender/windowmanager/intern/wm_playanim.c b/source/blender/windowmanager/intern/wm_playanim.c index 677be734d4b..232c9ad2e4d 100644 --- a/source/blender/windowmanager/intern/wm_playanim.c +++ b/source/blender/windowmanager/intern/wm_playanim.c @@ -69,8 +69,6 @@ #include "GHOST_C-api.h" #include "BLF_api.h" -#include "wm_event_types.h" - #include "WM_api.h" /* only for WM_main_playanim */ struct PlayState; diff --git a/source/blender/windowmanager/intern/wm_subwindow.c b/source/blender/windowmanager/intern/wm_subwindow.c index e26bcac9b1a..d2df020600a 100644 --- a/source/blender/windowmanager/intern/wm_subwindow.c +++ b/source/blender/windowmanager/intern/wm_subwindow.c @@ -53,7 +53,6 @@ #include "WM_api.h" #include "wm_subwindow.h" -#include "wm_window.h" /* wmSubWindow stored in wmWindow... but not exposed outside this C file */ /* it seems a bit redundant (area regions can store it too, but we keep it |