Cleanup: duplicate includes
authorCampbell Barton <ideasman42@gmail.com>
Wed, 17 Jun 2015 20:11:02 +0000 (06:11 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 17 Jun 2015 20:32:01 +0000 (06:32 +1000)
30 files changed:
source/blender/blenkernel/intern/appdir.c
source/blender/blenloader/intern/versioning_270.c
source/blender/compositor/intern/COM_ExecutionGroup.cpp
source/blender/compositor/nodes/COM_PlaneTrackDeformNode.h
source/blender/editors/space_info/info_draw.c
source/blender/imbuf/intern/IMB_anim.h
source/blender/imbuf/intern/anim_movie.c
source/blender/imbuf/intern/indexer.c
source/blender/makesrna/intern/rna_brush.c
source/blender/makesrna/intern/rna_curve.c
source/blender/makesrna/intern/rna_image_api.c
source/blender/makesrna/intern/rna_key.c
source/blender/makesrna/intern/rna_mask.c
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_pose.c
source/blender/makesrna/intern/rna_rna.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_sequencer.c
source/blender/makesrna/intern/rna_sequencer_api.c
source/blender/makesrna/intern/rna_space.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/nodes/texture/node_texture_util.h
source/blender/python/generic/blf_py_api.c
source/blender/python/generic/idprop_py_api.c
source/blender/python/generic/py_capi_utils.c
source/blender/python/intern/bpy_interface.c
source/blender/python/intern/bpy_rna.c
source/blender/python/mathutils/mathutils.c

index b1b32e75f5966874c2c0de204e2d2d144c0a0be7..233186993db6474e19a764f82bf5444599ea4f16 100644 (file)
 #include "BLI_fileops.h"
 #include "BLI_path_util.h"
 
+#include "BKE_blender.h"  /* BLENDER_VERSION */
 #include "BKE_appdir.h"  /* own include */
 
 #include "GHOST_Path-api.h"
 
-#include "../blenkernel/BKE_blender.h"  /* BLENDER_VERSION, bad level include (no function call) */
-
 #include "MEM_guardedalloc.h"
 
 #ifdef WIN32
index 37c255620d98acb0f66b0883de41bd087f39a292..6ab655e9b452f3b7203bcc4496b01b844fc21b47 100644 (file)
@@ -27,7 +27,6 @@
 
 #include "BLI_utildefines.h"
 #include "BLI_compiler_attrs.h"
-#include "BLI_string.h"
 
 /* for MinGW32 definition of NULL, could use BLI_blenlib.h instead too */
 #include <stddef.h>
@@ -49,7 +48,6 @@
 #include "DNA_particle_types.h"
 #include "DNA_linestyle_types.h"
 #include "DNA_actuator_types.h"
-#include "DNA_camera_types.h"
 #include "DNA_view3d_types.h"
 
 #include "DNA_genfile.h"
@@ -60,7 +58,6 @@
 #include "BKE_scene.h"
 #include "BKE_sequencer.h"
 #include "BKE_screen.h"
-#include "BKE_sequencer.h"
 
 #include "BLI_math.h"
 #include "BLI_listbase.h"
index 74c1128a37e57726fcd6b672ea6528286d8f8a96..5cb757d7dcbfce9ca341331bed7bd7bf5596e910 100644 (file)
@@ -32,7 +32,6 @@
 #include "COM_ExecutionSystem.h"
 #include "COM_ReadBufferOperation.h"
 #include "COM_WriteBufferOperation.h"
-#include "COM_ReadBufferOperation.h"
 #include "COM_WorkScheduler.h"
 #include "COM_ViewerOperation.h"
 #include "COM_ChunkOrder.h"
index 71e6ab12dfc7a2e0731b28643fef93a26d1f1ccf..653100ce6a4a2ffea57d7de111b3b2646e6a1776 100644 (file)
@@ -20,7 +20,6 @@
  */
 
 #include "COM_Node.h"
-#include "DNA_node_types.h"
 
 extern "C" {
 #  include "DNA_movieclip_types.h"
index e2895109b4874e24914fac5335566db366886ae7..cd424f45842b71119f745258dac0ac4fe1391b9c 100644 (file)
@@ -50,7 +50,7 @@
 #include "UI_view2d.h"
 
 #include "info_intern.h"
-#include "../space_info/textview.h"
+#include "textview.h"
 
 /* complicates things a bit, so leaving in old simple code */
 #define USE_INFO_NEWLINE
index 1fc43e22f68d9928b8424958e1a88c4c3a6e97f4..690ec8134071182c023849dc84f85fea128964af 100644 (file)
 #endif
 
 #ifdef WITH_REDCODE
-#  ifdef _WIN32 /* on windows we use the one in extern instead */
-#    include "libredcode/format.h"
-#  else
-#    include "libredcode/format.h"
-#  endif
+#  include "libredcode/format.h"
 #endif
 
 #include "IMB_imbuf_types.h"
index 2c8431d25ea8bd377a4921fd694e374abcce9b35..e2d56d297269a391853b349e41878d8503a5c186 100644 (file)
 #endif //WITH_FFMPEG
 
 #ifdef WITH_REDCODE
-#ifdef _WIN32 /* on windows we use the ones in extern instead */
-#include "libredcode/format.h"
-#include "libredcode/codec.h"
-#else
-#include "libredcode/format.h"
-#include "libredcode/codec.h"
-#endif
+#  include "libredcode/format.h"
+#  include "libredcode/codec.h"
 #endif
 
 #include "IMB_colormanagement.h"
index 0509dea89d5b6c657fa60bd7677617b25fec24a6..ac57b095800f7089abfb9e7612259d537c553f6d 100644 (file)
@@ -41,7 +41,6 @@
 #include "IMB_anim.h"
 #include "imbuf.h"
 
-#include "MEM_guardedalloc.h"
 #include "BKE_global.h"
 
 #ifdef WITH_AVI
index e9e4282772d126800b3baf75d87c9de9265d489f..b03b099048f0bef3ce34f93842d6c83246dac579 100644 (file)
@@ -111,8 +111,6 @@ EnumPropertyItem brush_image_tool_items[] = {
 
 #include "MEM_guardedalloc.h"
 
-#include "DNA_object_types.h"
-
 #include "RNA_access.h"
 
 #include "BKE_texture.h"
index 9a9ac28a7fd9df160cb275df7aacc945289f9568..fc028a46b7860a052c64879cc48a69812a0381b7 100644 (file)
@@ -46,9 +46,6 @@
 
 #include "WM_types.h"
 
-#include "BKE_curve.h"
-#include "ED_curve.h"
-
 #ifndef RNA_RUNTIME
 static EnumPropertyItem beztriple_handle_type_items[] = {
        {HD_FREE, "FREE", 0, "Free", ""},
@@ -124,8 +121,6 @@ static const EnumPropertyItem curve2d_fill_mode_items[] = {
 
 #ifdef RNA_RUNTIME
 
-#include "BLI_math.h"
-
 #include "DNA_object_types.h"
 
 #include "BKE_curve.h"
index 945359515abc7b9858407d1f66d88b4048a39047..c3c152a10b6d1dcd451d01cc9a53420bc27a9b81 100644 (file)
@@ -56,7 +56,6 @@
 #include "IMB_imbuf.h"
 #include "IMB_colormanagement.h"
 
-#include "BIF_gl.h"
 #include "GPU_draw.h"
 #include "GPU_debug.h"
 
index 249d132068c9cac849acd90452d151899983326f..04cba835ae234307c80644ca09c9cfbdf784c470 100644 (file)
@@ -48,7 +48,6 @@
 #include <stddef.h>
 
 #include "DNA_object_types.h"
-#include "DNA_scene_types.h"
 
 #include "BKE_animsys.h"
 #include "BKE_depsgraph.h"
index 4144872a6371721ebf8cc7772fbbc2aa73923011..b660236ea4f017cbdb47cf0757661589e32f0e63 100644 (file)
 
 #ifdef RNA_RUNTIME
 
-#include "DNA_mask_types.h"
 #include "DNA_movieclip_types.h"
 
 #include "BKE_depsgraph.h"
 #include "BKE_mask.h"
-#include "BKE_tracking.h"
 
 #include "BLI_math.h"
 
index d51ec2b3a706d460a2733a56db25a5d53fe4d41f..ec64aa3827589bd5fa183f7e28deaee6b7bde9be 100644 (file)
@@ -75,7 +75,6 @@ EnumPropertyItem mesh_delimit_mode_items[] = {
 #include "ED_mesh.h" /* XXX Bad level call */
 
 #include "WM_api.h"
-#include "WM_types.h"
 
 #include "rna_mesh_utils.h"
 
index d0cb0b990efbd556bfb931e4dc6d1390bbbbe482..19db101b32b3161767d719cb2aff9fc6a50fd882 100644 (file)
@@ -30,7 +30,6 @@
 
 #include "BLI_listbase.h"
 #include "BLI_math.h"
-#include "BLI_string.h"
 #include "BLI_utildefines.h"
 
 #include "BLF_translation.h"
@@ -39,7 +38,6 @@
 #include "DNA_mesh_types.h"
 #include "DNA_node_types.h"
 #include "DNA_object_types.h"
-#include "DNA_scene_types.h"
 #include "DNA_text_types.h"
 #include "DNA_texture_types.h"
 
@@ -48,7 +46,6 @@
 #include "BKE_node.h"
 #include "BKE_image.h"
 #include "BKE_texture.h"
-#include "BKE_idprop.h"
 
 #include "RNA_access.h"
 #include "RNA_define.h"
index 2ef5c6ec12e9c1d7b6b8db696a52cfb77f057935..c6a6136d90dc710af86c733ca5d491d9d43abaf6 100644 (file)
@@ -46,7 +46,6 @@
 #include "BKE_paint.h"
 #include "BKE_editmesh.h"
 #include "BKE_group.h" /* needed for BKE_group_object_exists() */
-#include "BKE_object.h" /* Needed for BKE_object_matrix_local_get() */
 #include "BKE_object_deform.h"
 
 #include "RNA_access.h"
@@ -202,7 +201,6 @@ EnumPropertyItem object_axis_unsigned_items[] = {
 #include "BKE_scene.h"
 #include "BKE_deform.h"
 
-#include "ED_mesh.h"
 #include "ED_object.h"
 #include "ED_particle.h"
 #include "ED_curve.h"
index 3ff51423e9a29b048a0f337988018cd0ac77b6a9..afbb97f519d71e68e4c806f7e3bd4e47308a5b36 100644 (file)
@@ -109,8 +109,6 @@ EnumPropertyItem color_sets_items[] = {
 #include "ED_object.h"
 #include "ED_armature.h"
 
-#include "MEM_guardedalloc.h"
-
 #include "WM_api.h"
 
 #include "RNA_access.h"
index 42e231fa76f7a363e8ebe66bb51cb1d72aae2a36..4650e27f63ed9c13331f0f9a2e494baf3c139afa 100644 (file)
@@ -105,7 +105,6 @@ EnumPropertyItem property_unit_items[] = {
 
 #ifdef RNA_RUNTIME
 #include "MEM_guardedalloc.h"
-#include "BLI_utildefines.h"
 #include "BLI_ghash.h"
 
 /* Struct */
index 87118e257b8cb8584daf2b583b5d70e5e1d62387..0986c50e8e427cf40bdde46ee56bbdff60621f97 100644 (file)
 
 #include "BLF_translation.h"
 
-#include "BKE_freestyle.h"
 #include "BKE_editmesh.h"
 #include "BKE_paint.h"
-#include "BKE_scene.h"
 
 #include "GPU_extensions.h"
 
@@ -407,8 +405,6 @@ EnumPropertyItem stereo3d_interlace_type_items[] = {
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_threads.h"
-
 #include "BKE_brush.h"
 #include "BKE_context.h"
 #include "BKE_global.h"
@@ -418,7 +414,6 @@ EnumPropertyItem stereo3d_interlace_type_items[] = {
 #include "BKE_pointcache.h"
 #include "BKE_scene.h"
 #include "BKE_depsgraph.h"
-#include "BKE_image.h"
 #include "BKE_mesh.h"
 #include "BKE_sound.h"
 #include "BKE_screen.h"
@@ -426,8 +421,6 @@ EnumPropertyItem stereo3d_interlace_type_items[] = {
 #include "BKE_animsys.h"
 #include "BKE_freestyle.h"
 
-#include "WM_api.h"
-
 #include "ED_info.h"
 #include "ED_node.h"
 #include "ED_view3d.h"
@@ -435,8 +428,6 @@ EnumPropertyItem stereo3d_interlace_type_items[] = {
 #include "ED_keyframing.h"
 #include "ED_image.h"
 
-#include "RE_engine.h"
-
 #ifdef WITH_FREESTYLE
 #include "FRS_freestyle.h"
 #endif
index df996c8f31a3a3e4504433874939f99c3a9fc888..d62509e5ab554f1b10a8dca5791daf5d1381f080 100644 (file)
@@ -75,7 +75,6 @@ EnumPropertyItem sequence_modifier_type_items[] = {
 #include "BKE_idprop.h"
 
 #include "WM_api.h"
-#include "WM_types.h"
 
 #include "IMB_imbuf.h"
 
index 44169fa641e1368529da301712ef88b36a5e3cda..5e9866fa73e348d84a8ccffcb0e3ec2e071b079b 100644 (file)
@@ -42,8 +42,6 @@
 
 //#include "DNA_anim_types.h"
 #include "DNA_image_types.h"
-#include "DNA_scene_types.h"
-#include "DNA_sequence_types.h"
 #include "DNA_mask_types.h"
 #include "DNA_sound_types.h"
 
index 8cc6ddcf23ace58ba469671fb127d1ef1c413737..8de81e4f3c7a1a0d9bd342a58bbd06648f4a7a07 100644 (file)
@@ -35,7 +35,6 @@
 #include "BKE_key.h"
 #include "BKE_movieclip.h"
 #include "BKE_node.h"
-#include "BKE_screen.h"
 
 #include "DNA_action_types.h"
 #include "DNA_key_types.h"
@@ -58,8 +57,6 @@
 #include "RE_engine.h"
 #include "RE_pipeline.h"
 
-#include "ED_fileselect.h"
-
 #include "RNA_enum_types.h"
 
 
@@ -225,7 +222,6 @@ static EnumPropertyItem buttons_texture_context_items[] = {
 #ifdef RNA_RUNTIME
 
 #include "DNA_anim_types.h"
-#include "DNA_mask_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_userdef_types.h"
index b4f67630ffd2b85d302927d46eac55edf47562af..9123a0682e6308ff03c02b459795b74e0f7a3a7b 100644 (file)
@@ -87,7 +87,6 @@ EnumPropertyItem navigation_mode_items[] = {
 #include "DNA_screen_types.h"
 
 #include "BKE_blender.h"
-#include "BKE_DerivedMesh.h"
 #include "BKE_depsgraph.h"
 #include "BKE_global.h"
 #include "BKE_main.h"
@@ -105,8 +104,6 @@ EnumPropertyItem navigation_mode_items[] = {
 
 #include "CCL_api.h"
 
-#include "BKE_addon.h"
-
 #ifdef WITH_SDL_DYNLOAD
 #  include "sdlew.h"
 #endif
index eb81bcd69496416208c57ceaa0b1bb28b874bc6f..2c5ecfdae0d5458b399411778b220bda4d07d3e9 100644 (file)
@@ -67,8 +67,6 @@
 #include "node_util.h"
 #include "NOD_texture.h"
 
-#include "NOD_texture.h"
-
 #include "BLF_translation.h"
 
 #include "IMB_imbuf_types.h"
index ed1ac7ceed9a7fa726d041379ea14f30de4fa055..5364c3bbb9e69c5cbb147d952349c83ee84ba751 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "BLI_utildefines.h"
 
-#include "../generic/python_utildefines.h"
+#include "python_utildefines.h"
 
 
 PyDoc_STRVAR(py_blf_position_doc,
index 1f35572a483fce284d3534a8db1cee7a27bd6ea4..30e0ccdb1069944c3ca29b6fd089937d8ee94a6c 100644 (file)
@@ -41,7 +41,7 @@
 #include "py_capi_utils.h"
 #endif
 
-#include "../generic/python_utildefines.h"
+#include "python_utildefines.h"
 
 
 /*********************** ID Property Main Wrapper Stuff ***************/
index 6443c65a50ad9747805fcb6b38f400ed99ad4a58..1b72928b26e1c3d7471f842ae51d612cb49383b8 100644 (file)
@@ -37,7 +37,7 @@
 
 #include "py_capi_utils.h"
 
-#include "../generic/python_utildefines.h"
+#include "python_utildefines.h"
 
 /* only for BLI_strncpy_wchar_from_utf8, should replace with py funcs but too late in release now */
 #include "BLI_string_utf8.h"
index 2c893c37bd6b19220489acf2f5a39d30e38fb501..7e5ad00159e0dc44994f985e6ac34c4c1f3d49e8 100644 (file)
@@ -788,7 +788,6 @@ int BPY_context_member_get(bContext *C, const char *member, bContextDataResult *
 }
 
 #ifdef WITH_PYTHON_MODULE
-#include "BLI_fileops.h"
 /* TODO, reloading the module isn't functional at the moment. */
 
 static void bpy_module_free(void *mod);
index 3f6ba4cd21cc64bcac8142e550e5324940847fd0..d15e3b36ced5065d7a90cfbc3c3c3401f8931a2e 100644 (file)
 #include "bpy_rna_callback.h"
 #include "bpy_intern_string.h"
 
-#ifdef USE_PYRNA_INVALIDATE_WEAKREF
-#  include "MEM_guardedalloc.h"
-#endif
-
 #ifdef USE_PYRNA_INVALIDATE_WEAKREF
 #  include "BLI_ghash.h"
 #endif
index 9ec5e90a49374b8a46648d5a4f673a1253d6acf1..361fbc8a005e823659a0b4160df0b2ca8c6f5cb8 100644 (file)
@@ -110,7 +110,7 @@ Py_hash_t mathutils_array_hash(const float *array, size_t array_len)
        return x;
 }
 
-/* helper functionm returns length of the 'value', -1 on error */
+/* helper function returns length of the 'value', -1 on error */
 int mathutils_array_parse(float *array, int array_min, int array_max, PyObject *value, const char *error_prefix)
 {
        const int flag = array_max;