From cc154144efc9ec89c2fb50a950a487e6e79dcec8 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 13 Feb 2024 13:53:10 +1100 Subject: [PATCH] Cleanup: unused includes in source/blender/blenloader Remove 45 includes. --- source/blender/blenloader/intern/blend_validate.cc | 1 - source/blender/blenloader/intern/readblenentry.cc | 2 -- source/blender/blenloader/intern/readfile_tempload.cc | 1 - source/blender/blenloader/intern/versioning_250.cc | 6 ------ source/blender/blenloader/intern/versioning_260.cc | 7 ------- source/blender/blenloader/intern/versioning_270.cc | 4 ---- source/blender/blenloader/intern/versioning_280.cc | 8 -------- source/blender/blenloader/intern/versioning_290.cc | 7 ------- source/blender/blenloader/intern/versioning_400.cc | 8 -------- source/blender/blenloader/intern/versioning_common.cc | 1 - source/blender/blenloader/intern/versioning_defaults.cc | 3 --- source/blender/blenloader/intern/versioning_legacy.cc | 1 - source/blender/blenloader/intern/versioning_userdef.cc | 1 - 13 files changed, 50 deletions(-) diff --git a/source/blender/blenloader/intern/blend_validate.cc b/source/blender/blenloader/intern/blend_validate.cc index 8b1832a3943..1dfe4cdce3d 100644 --- a/source/blender/blenloader/intern/blend_validate.cc +++ b/source/blender/blenloader/intern/blend_validate.cc @@ -15,7 +15,6 @@ #include "BLI_utildefines.h" -#include "BLI_blenlib.h" #include "BLI_linklist.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/blenloader/intern/readblenentry.cc b/source/blender/blenloader/intern/readblenentry.cc index 24c9bdc83d4..f5b353ae24b 100644 --- a/source/blender/blenloader/intern/readblenentry.cc +++ b/source/blender/blenloader/intern/readblenentry.cc @@ -17,7 +17,6 @@ #include "BLI_ghash.h" #include "BLI_linklist.h" -#include "BLI_listbase.h" #include "BLI_path_util.h" /* Only for assertions. */ #include "BLI_string.h" #include "BLI_utildefines.h" @@ -32,7 +31,6 @@ #include "BLO_blend_defs.hh" #include "BLO_readfile.hh" -#include "BLO_undofile.hh" #include "readfile.hh" diff --git a/source/blender/blenloader/intern/readfile_tempload.cc b/source/blender/blenloader/intern/readfile_tempload.cc index 4a832b12eb2..3b636a8424d 100644 --- a/source/blender/blenloader/intern/readfile_tempload.cc +++ b/source/blender/blenloader/intern/readfile_tempload.cc @@ -12,7 +12,6 @@ #include "BLI_string.h" #include "BKE_main.hh" -#include "BKE_report.hh" #include "DNA_ID.h" diff --git a/source/blender/blenloader/intern/versioning_250.cc b/source/blender/blenloader/intern/versioning_250.cc index 54459c664d6..0572c983e23 100644 --- a/source/blender/blenloader/intern/versioning_250.cc +++ b/source/blender/blenloader/intern/versioning_250.cc @@ -24,10 +24,8 @@ #include "DNA_cloth_types.h" #include "DNA_constraint_types.h" #include "DNA_fluid_types.h" -#include "DNA_ipo_types.h" #include "DNA_key_types.h" #include "DNA_lattice_types.h" -#include "DNA_light_types.h" #include "DNA_material_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" @@ -41,7 +39,6 @@ #include "DNA_sound_types.h" #include "DNA_space_types.h" #include "DNA_view3d_types.h" -#include "DNA_world_types.h" #include "MEM_guardedalloc.h" @@ -59,15 +56,12 @@ #include "BKE_global.hh" /* for G */ #include "BKE_lib_id.hh" #include "BKE_main.hh" -#include "BKE_mesh.hh" #include "BKE_modifier.hh" #include "BKE_multires.hh" #include "BKE_node.h" #include "BKE_node_tree_update.hh" #include "BKE_particle.h" -#include "BKE_pointcache.h" #include "BKE_screen.hh" -#include "BKE_sound.h" #include "BKE_texture.h" #include "SEQ_iterator.hh" diff --git a/source/blender/blenloader/intern/versioning_260.cc b/source/blender/blenloader/intern/versioning_260.cc index 58fa8b438a7..6b2cef4132e 100644 --- a/source/blender/blenloader/intern/versioning_260.cc +++ b/source/blender/blenloader/intern/versioning_260.cc @@ -23,7 +23,6 @@ #include "DNA_dynamicpaint_types.h" #include "DNA_fluid_types.h" #include "DNA_genfile.h" -#include "DNA_key_types.h" #include "DNA_light_types.h" #include "DNA_linestyle_types.h" #include "DNA_material_types.h" @@ -33,7 +32,6 @@ #include "DNA_object_fluidsim_types.h" #include "DNA_object_types.h" #include "DNA_screen_types.h" -#include "DNA_sdna_types.h" #include "DNA_sequence_types.h" #include "DNA_space_types.h" #include "DNA_text_types.h" @@ -50,19 +48,15 @@ #include "BLI_math_vector.h" #include "BLI_string_utils.hh" -#include "BLT_translation.hh" - #include "BKE_anim_visualization.h" #include "BKE_customdata.hh" #include "BKE_image.h" #include "BKE_main.hh" /* for Main */ -#include "BKE_mesh.hh" /* for ME_ defines (patching) */ #include "BKE_mesh_legacy_convert.hh" #include "BKE_modifier.hh" #include "BKE_node_runtime.hh" #include "BKE_node_tree_update.hh" #include "BKE_particle.h" -#include "BKE_pointcache.h" #include "BKE_scene.hh" #include "BKE_screen.hh" #include "BKE_text.h" /* for txt_extended_ascii_as_utf8 */ @@ -81,7 +75,6 @@ #include "NOD_common.h" #include "NOD_composite.hh" -#include "NOD_texture.h" #include "BLO_readfile.hh" diff --git a/source/blender/blenloader/intern/versioning_270.cc b/source/blender/blenloader/intern/versioning_270.cc index 15b0b4b5e22..dc57630b4ab 100644 --- a/source/blender/blenloader/intern/versioning_270.cc +++ b/source/blender/blenloader/intern/versioning_270.cc @@ -33,13 +33,11 @@ #include "DNA_mask_types.h" #include "DNA_mesh_types.h" #include "DNA_modifier_types.h" -#include "DNA_object_force_types.h" #include "DNA_object_types.h" #include "DNA_particle_types.h" #include "DNA_pointcache_types.h" #include "DNA_rigidbody_types.h" #include "DNA_screen_types.h" -#include "DNA_sdna_types.h" #include "DNA_sequence_types.h" #include "DNA_space_types.h" #include "DNA_view3d_types.h" @@ -59,7 +57,6 @@ #include "BKE_node.h" #include "BKE_scene.hh" #include "BKE_screen.hh" -#include "BKE_tracking.h" #include "DNA_material_types.h" #include "SEQ_effects.hh" @@ -76,7 +73,6 @@ #include "BLO_readfile.hh" -#include "NOD_common.h" #include "NOD_composite.hh" #include "NOD_socket.hh" diff --git a/source/blender/blenloader/intern/versioning_280.cc b/source/blender/blenloader/intern/versioning_280.cc index f043166e104..f318d889d9a 100644 --- a/source/blender/blenloader/intern/versioning_280.cc +++ b/source/blender/blenloader/intern/versioning_280.cc @@ -63,8 +63,6 @@ #include "BKE_animsys.h" #include "BKE_blender.hh" -#include "BKE_brush.hh" -#include "BKE_cloth.hh" #include "BKE_collection.hh" #include "BKE_colortools.hh" #include "BKE_constraint.h" @@ -73,10 +71,7 @@ #include "BKE_fcurve.h" #include "BKE_fcurve_driver.h" #include "BKE_freestyle.h" -#include "BKE_global.hh" #include "BKE_gpencil_geom_legacy.h" -#include "BKE_gpencil_legacy.h" -#include "BKE_gpencil_modifier_legacy.h" #include "BKE_idprop.h" #include "BKE_key.hh" #include "BKE_layer.hh" @@ -85,7 +80,6 @@ #include "BKE_mesh.hh" #include "BKE_mesh_legacy_convert.hh" #include "BKE_node.h" -#include "BKE_node_tree_update.hh" #include "BKE_paint.hh" #include "BKE_pointcache.h" #include "BKE_report.hh" @@ -104,8 +98,6 @@ #include "IMB_colormanagement.hh" #include "IMB_imbuf.hh" -#include "DEG_depsgraph.hh" - #include "BLT_translation.hh" #include "BLO_read_write.hh" diff --git a/source/blender/blenloader/intern/versioning_290.cc b/source/blender/blenloader/intern/versioning_290.cc index 028ab2126ba..b64df04255b 100644 --- a/source/blender/blenloader/intern/versioning_290.cc +++ b/source/blender/blenloader/intern/versioning_290.cc @@ -25,7 +25,6 @@ #include "DNA_cachefile_types.h" #include "DNA_collection_types.h" #include "DNA_constraint_types.h" -#include "DNA_curves_types.h" #include "DNA_fluid_types.h" #include "DNA_genfile.h" #include "DNA_gpencil_legacy_types.h" @@ -48,9 +47,7 @@ #undef DNA_GENFILE_VERSIONING_MACROS -#include "BKE_animsys.h" #include "BKE_armature.hh" -#include "BKE_attribute.hh" #include "BKE_collection.hh" #include "BKE_colortools.hh" #include "BKE_cryptomatte.h" @@ -68,13 +65,9 @@ #include "IMB_imbuf.hh" #include "MEM_guardedalloc.h" -#include "RNA_access.hh" - #include "SEQ_proxy.hh" -#include "SEQ_render.hh" #include "SEQ_sequencer.hh" #include "SEQ_time.hh" -#include "SEQ_transform.hh" #include "BLO_readfile.hh" #include "readfile.hh" diff --git a/source/blender/blenloader/intern/versioning_400.cc b/source/blender/blenloader/intern/versioning_400.cc index 20eb0ca2c23..0a05db636a4 100644 --- a/source/blender/blenloader/intern/versioning_400.cc +++ b/source/blender/blenloader/intern/versioning_400.cc @@ -11,8 +11,6 @@ #include #include -#include "CLG_log.h" - /* Define macros in `DNA_genfile.h`. */ #define DNA_GENFILE_VERSIONING_MACROS @@ -49,7 +47,6 @@ #include "BKE_animsys.h" #include "BKE_armature.hh" #include "BKE_attribute.hh" -#include "BKE_collection.hh" #include "BKE_curve.hh" #include "BKE_effect.h" #include "BKE_grease_pencil.hh" @@ -57,20 +54,15 @@ #include "BKE_main.hh" #include "BKE_material.h" #include "BKE_mesh_legacy_convert.hh" -#include "BKE_node.hh" #include "BKE_node_runtime.hh" #include "BKE_scene.hh" #include "BKE_tracking.h" #include "SEQ_iterator.hh" -#include "SEQ_retiming.hh" -#include "SEQ_sequencer.hh" #include "ANIM_armature_iter.hh" #include "ANIM_bone_collections.hh" -#include "ED_armature.hh" - #include "BLT_translation.hh" #include "BLO_read_write.hh" diff --git a/source/blender/blenloader/intern/versioning_common.cc b/source/blender/blenloader/intern/versioning_common.cc index 91885f1a902..a1f0d4e8582 100644 --- a/source/blender/blenloader/intern/versioning_common.cc +++ b/source/blender/blenloader/intern/versioning_common.cc @@ -26,7 +26,6 @@ #include "BKE_main.hh" #include "BKE_main_namemap.hh" #include "BKE_mesh_legacy_convert.hh" -#include "BKE_node.hh" #include "BKE_node_runtime.hh" #include "SEQ_sequencer.hh" diff --git a/source/blender/blenloader/intern/versioning_defaults.cc b/source/blender/blenloader/intern/versioning_defaults.cc index 40802ec83dd..30faaf52eb0 100644 --- a/source/blender/blenloader/intern/versioning_defaults.cc +++ b/source/blender/blenloader/intern/versioning_defaults.cc @@ -22,7 +22,6 @@ #include "BLI_math_vector.h" #include "BLI_math_vector_types.hh" #include "BLI_string.h" -#include "BLI_system.h" #include "BLI_utildefines.h" #include "DNA_camera_types.h" @@ -33,7 +32,6 @@ #include "DNA_mask_types.h" #include "DNA_material_types.h" #include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" @@ -56,7 +54,6 @@ #include "BKE_main_namemap.hh" #include "BKE_material.h" #include "BKE_mesh.hh" -#include "BKE_node.hh" #include "BKE_node_runtime.hh" #include "BKE_node_tree_update.hh" #include "BKE_paint.hh" diff --git a/source/blender/blenloader/intern/versioning_legacy.cc b/source/blender/blenloader/intern/versioning_legacy.cc index e3028890213..f32d4997bfd 100644 --- a/source/blender/blenloader/intern/versioning_legacy.cc +++ b/source/blender/blenloader/intern/versioning_legacy.cc @@ -27,7 +27,6 @@ #include "DNA_effect_types.h" #include "DNA_key_types.h" #include "DNA_lattice_types.h" -#include "DNA_light_types.h" #include "DNA_material_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" diff --git a/source/blender/blenloader/intern/versioning_userdef.cc b/source/blender/blenloader/intern/versioning_userdef.cc index 55f70b0f94a..2e4206c546f 100644 --- a/source/blender/blenloader/intern/versioning_userdef.cc +++ b/source/blender/blenloader/intern/versioning_userdef.cc @@ -19,7 +19,6 @@ #include "BLI_utildefines.h" #include "DNA_anim_types.h" -#include "DNA_collection_types.h" #include "DNA_curve_types.h" #include "DNA_scene_types.h" #include "DNA_space_types.h"