diff options
121 files changed, 178 insertions, 254 deletions
diff --git a/source/blender/alembic/intern/abc_hair.cc b/source/blender/alembic/intern/abc_hair.cc index 50c2d04e042..efe8ea6e79e 100644 --- a/source/blender/alembic/intern/abc_hair.cc +++ b/source/blender/alembic/intern/abc_hair.cc @@ -37,7 +37,6 @@ extern "C" { #include "BLI_listbase.h" #include "BLI_math_geom.h" -#include "BKE_library.h" #include "BKE_mesh.h" #include "BKE_mesh_runtime.h" #include "BKE_object.h" diff --git a/source/blender/alembic/intern/abc_mball.cc b/source/blender/alembic/intern/abc_mball.cc index cfb0f2cfdb1..c7b2d0c88a5 100644 --- a/source/blender/alembic/intern/abc_mball.cc +++ b/source/blender/alembic/intern/abc_mball.cc @@ -32,7 +32,6 @@ extern "C" { #include "BKE_curve.h" #include "BKE_displist.h" #include "BKE_library.h" -#include "BKE_main.h" #include "BKE_mball.h" #include "BKE_mesh.h" #include "BKE_object.h" diff --git a/source/blender/alembic/intern/alembic_capi.cc b/source/blender/alembic/intern/alembic_capi.cc index 82ebad0bbc2..c3e07fcdb2d 100644 --- a/source/blender/alembic/intern/alembic_capi.cc +++ b/source/blender/alembic/intern/alembic_capi.cc @@ -51,7 +51,6 @@ extern "C" { #include "BKE_global.h" #include "BKE_layer.h" #include "BKE_library.h" -#include "BKE_main.h" #include "BKE_scene.h" #include "DEG_depsgraph.h" diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c index 639e4f40004..17940b947cb 100644 --- a/source/blender/blenkernel/intern/anim_sys.c +++ b/source/blender/blenkernel/intern/anim_sys.c @@ -57,15 +57,15 @@ #include "DNA_texture_types.h" #include "DNA_world_types.h" -#include "BKE_animsys.h" #include "BKE_action.h" +#include "BKE_animsys.h" #include "BKE_context.h" #include "BKE_fcurve.h" -#include "BKE_nla.h" #include "BKE_global.h" +#include "BKE_library.h" #include "BKE_main.h" #include "BKE_material.h" -#include "BKE_library.h" +#include "BKE_nla.h" #include "BKE_report.h" #include "BKE_texture.h" diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 530a4c8dfb8..b9bfef75187 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -126,6 +126,7 @@ #include "BKE_cachefile.h" #include "BKE_cloth.h" #include "BKE_collection.h" +#include "BKE_colortools.h" #include "BKE_constraint.h" #include "BKE_context.h" #include "BKE_curve.h" @@ -134,15 +135,15 @@ #include "BKE_global.h" // for G #include "BKE_gpencil.h" #include "BKE_gpencil_modifier.h" +#include "BKE_idcode.h" +#include "BKE_idprop.h" #include "BKE_layer.h" -#include "BKE_library.h" // for which_libbase +#include "BKE_library.h" #include "BKE_library_idmap.h" #include "BKE_library_override.h" #include "BKE_library_query.h" -#include "BKE_idcode.h" -#include "BKE_idprop.h" -#include "BKE_material.h" #include "BKE_main.h" // for Main +#include "BKE_material.h" #include "BKE_mesh.h" // for ME_ defines (patching) #include "BKE_mesh_runtime.h" #include "BKE_modifier.h" @@ -150,6 +151,7 @@ #include "BKE_node.h" // for tree type defines #include "BKE_object.h" #include "BKE_ocean.h" +#include "BKE_outliner_treehash.h" #include "BKE_paint.h" #include "BKE_particle.h" #include "BKE_pointcache.h" @@ -158,9 +160,7 @@ #include "BKE_screen.h" #include "BKE_sequencer.h" #include "BKE_shader_fx.h" -#include "BKE_outliner_treehash.h" #include "BKE_sound.h" -#include "BKE_colortools.h" #include "BKE_workspace.h" #include "DRW_engine.h" diff --git a/source/blender/blenloader/intern/versioning_250.c b/source/blender/blenloader/intern/versioning_250.c index 390fa460a55..ff56875e8fd 100644 --- a/source/blender/blenloader/intern/versioning_250.c +++ b/source/blender/blenloader/intern/versioning_250.c @@ -72,8 +72,8 @@ #include "BKE_armature.h" #include "BKE_colortools.h" #include "BKE_global.h" // for G -#include "BKE_library.h" // for which_libbase -#include "BKE_main.h" // for Main +#include "BKE_library.h" +#include "BKE_main.h" #include "BKE_mesh.h" // for ME_ defines (patching) #include "BKE_modifier.h" #include "BKE_multires.h" diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index 919c6d05740..fd097927f57 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -163,25 +163,24 @@ #include "BKE_action.h" #include "BKE_blender_version.h" #include "BKE_bpath.h" -#include "BKE_curve.h" #include "BKE_collection.h" #include "BKE_constraint.h" +#include "BKE_curve.h" +#include "BKE_fcurve.h" #include "BKE_global.h" // for G #include "BKE_gpencil_modifier.h" #include "BKE_idcode.h" #include "BKE_layer.h" -#include "BKE_library.h" // for set_listbasepointers #include "BKE_library_override.h" #include "BKE_main.h" +#include "BKE_mesh.h" +#include "BKE_modifier.h" #include "BKE_node.h" +#include "BKE_pointcache.h" #include "BKE_report.h" #include "BKE_sequencer.h" #include "BKE_shader_fx.h" #include "BKE_subsurf.h" -#include "BKE_modifier.h" -#include "BKE_fcurve.h" -#include "BKE_pointcache.h" -#include "BKE_mesh.h" #include "BKE_workspace.h" #ifdef USE_NODE_COMPAT_CUSTOMNODES diff --git a/source/blender/collada/ArmatureExporter.cpp b/source/blender/collada/ArmatureExporter.cpp index a77385c8d00..45628054ad2 100644 --- a/source/blender/collada/ArmatureExporter.cpp +++ b/source/blender/collada/ArmatureExporter.cpp @@ -39,10 +39,8 @@ #include "BKE_armature.h" extern "C" { -#include "BKE_main.h" -#include "BKE_mesh.h" #include "BKE_global.h" -#include "BKE_library.h" +#include "BKE_mesh.h" } #include "ED_armature.h" diff --git a/source/blender/collada/ControllerExporter.cpp b/source/blender/collada/ControllerExporter.cpp index 84812451c05..862ce306409 100644 --- a/source/blender/collada/ControllerExporter.cpp +++ b/source/blender/collada/ControllerExporter.cpp @@ -38,11 +38,10 @@ #include "BKE_armature.h" extern "C" { -#include "BKE_main.h" -#include "BKE_mesh.h" #include "BKE_global.h" -#include "BKE_library.h" #include "BKE_idprop.h" +#include "BKE_library.h" +#include "BKE_mesh.h" } #include "ED_armature.h" diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp index eea51d1560f..50a9e351bc6 100644 --- a/source/blender/collada/DocumentImporter.cpp +++ b/source/blender/collada/DocumentImporter.cpp @@ -58,15 +58,14 @@ extern "C" { #include "BKE_camera.h" #include "BKE_collection.h" -#include "BKE_main.h" +#include "BKE_fcurve.h" +#include "BKE_global.h" +#include "BKE_image.h" #include "BKE_layer.h" #include "BKE_lamp.h" #include "BKE_library.h" -#include "BKE_fcurve.h" -#include "BKE_scene.h" -#include "BKE_global.h" #include "BKE_material.h" -#include "BKE_image.h" +#include "BKE_scene.h" #include "BLI_path_util.h" diff --git a/source/blender/collada/GeometryExporter.cpp b/source/blender/collada/GeometryExporter.cpp index b155160697b..928509cbef9 100644 --- a/source/blender/collada/GeometryExporter.cpp +++ b/source/blender/collada/GeometryExporter.cpp @@ -40,10 +40,9 @@ extern "C" { #include "BLI_utildefines.h" - #include "BKE_main.h" + #include "BKE_customdata.h" #include "BKE_global.h" #include "BKE_library.h" - #include "BKE_customdata.h" #include "BKE_material.h" #include "BKE_mesh.h" } diff --git a/source/blender/collada/ImageExporter.cpp b/source/blender/collada/ImageExporter.cpp index 23e67733e9c..c2666f591b5 100644 --- a/source/blender/collada/ImageExporter.cpp +++ b/source/blender/collada/ImageExporter.cpp @@ -37,12 +37,13 @@ extern "C" { #include "BKE_customdata.h" #include "BKE_global.h" #include "BKE_image.h" -#include "BKE_library.h" #include "BKE_main.h" #include "BKE_mesh.h" + #include "BLI_fileops.h" #include "BLI_path_util.h" #include "BLI_string.h" + #include "IMB_imbuf_types.h" } diff --git a/source/blender/collada/MeshImporter.cpp b/source/blender/collada/MeshImporter.cpp index 4c0c13db72c..5aac5a09118 100644 --- a/source/blender/collada/MeshImporter.cpp +++ b/source/blender/collada/MeshImporter.cpp @@ -43,7 +43,6 @@ extern "C" { #include "BKE_displist.h" #include "BKE_global.h" #include "BKE_library.h" - #include "BKE_main.h" #include "BKE_material.h" #include "BKE_mesh.h" #include "BKE_object.h" diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp index a70ff3a7c8f..5f01a092699 100644 --- a/source/blender/collada/collada_utils.cpp +++ b/source/blender/collada/collada_utils.cpp @@ -47,13 +47,12 @@ extern "C" { #include "BKE_context.h" #include "BKE_customdata.h" -#include "BKE_object.h" #include "BKE_global.h" -#include "BKE_library.h" -#include "BKE_main.h" #include "BKE_layer.h" +#include "BKE_library.h" #include "BKE_mesh.h" #include "BKE_mesh_runtime.h" +#include "BKE_object.h" #include "BKE_scene.h" #include "ED_armature.h" diff --git a/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp b/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp index f7fcf63fabb..c50326e85e2 100644 --- a/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp +++ b/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp @@ -26,12 +26,13 @@ #include "COM_OutputFileMultiViewOperation.h" #include <string.h> + #include "BLI_listbase.h" #include "BLI_path_util.h" #include "BLI_string.h" -#include "BKE_image.h" + #include "BKE_global.h" -#include "BKE_library.h" +#include "BKE_image.h" #include "BKE_main.h" #include "BKE_scene.h" diff --git a/source/blender/compositor/operations/COM_OutputFileOperation.cpp b/source/blender/compositor/operations/COM_OutputFileOperation.cpp index de1a807f137..e2819347808 100644 --- a/source/blender/compositor/operations/COM_OutputFileOperation.cpp +++ b/source/blender/compositor/operations/COM_OutputFileOperation.cpp @@ -22,13 +22,15 @@ */ #include "COM_OutputFileOperation.h" + #include <string.h> + #include "BLI_listbase.h" #include "BLI_path_util.h" #include "BLI_string.h" -#include "BKE_image.h" + #include "BKE_global.h" -#include "BKE_library.h" +#include "BKE_image.h" #include "BKE_main.h" #include "BKE_scene.h" diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc index f1af27ed11d..b2e46f3d8e9 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc @@ -82,8 +82,6 @@ extern "C" { #include "BKE_idcode.h" #include "BKE_key.h" #include "BKE_lattice.h" -#include "BKE_library.h" -#include "BKE_main.h" #include "BKE_mask.h" #include "BKE_material.h" #include "BKE_mesh.h" diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc index 0c17aa1f58d..98a6a75d994 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc @@ -80,8 +80,6 @@ extern "C" { #include "BKE_collision.h" #include "BKE_fcurve.h" #include "BKE_key.h" -#include "BKE_library.h" -#include "BKE_main.h" #include "BKE_material.h" #include "BKE_mball.h" #include "BKE_modifier.h" diff --git a/source/blender/depsgraph/intern/depsgraph_tag.cc b/source/blender/depsgraph/intern/depsgraph_tag.cc index 38d8b891572..e2a87f16408 100644 --- a/source/blender/depsgraph/intern/depsgraph_tag.cc +++ b/source/blender/depsgraph/intern/depsgraph_tag.cc @@ -52,8 +52,6 @@ extern "C" { #include "BKE_animsys.h" #include "BKE_idcode.h" -#include "BKE_library.h" -#include "BKE_main.h" #include "BKE_node.h" #include "BKE_scene.h" #include "BKE_workspace.h" diff --git a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc index c1cbf03a904..573de18e532 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc @@ -54,7 +54,6 @@ #include "BKE_idprop.h" #include "BKE_layer.h" #include "BKE_library.h" -#include "BKE_main.h" #include "BKE_scene.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/animation/keyframes_general.c b/source/blender/editors/animation/keyframes_general.c index cff57e39fa0..c4d38870258 100644 --- a/source/blender/editors/animation/keyframes_general.c +++ b/source/blender/editors/animation/keyframes_general.c @@ -47,7 +47,6 @@ #include "BKE_action.h" #include "BKE_fcurve.h" #include "BKE_report.h" -#include "BKE_library.h" #include "BKE_main.h" #include "BKE_global.h" #include "BKE_deform.h" diff --git a/source/blender/editors/armature/pose_lib.c b/source/blender/editors/armature/pose_lib.c index 280aa73b1c8..e1cc954e587 100644 --- a/source/blender/editors/armature/pose_lib.c +++ b/source/blender/editors/armature/pose_lib.c @@ -43,13 +43,13 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BKE_animsys.h" #include "BKE_action.h" +#include "BKE_animsys.h" #include "BKE_armature.h" #include "BKE_global.h" #include "BKE_idprop.h" -#include "BKE_main.h" #include "BKE_library.h" +#include "BKE_main.h" #include "BKE_object.h" #include "BKE_context.h" diff --git a/source/blender/editors/armature/pose_transform.c b/source/blender/editors/armature/pose_transform.c index 92a3402fe04..5a6757294dc 100644 --- a/source/blender/editors/armature/pose_transform.c +++ b/source/blender/editors/armature/pose_transform.c @@ -38,8 +38,8 @@ #include "BLI_math.h" #include "BLI_string_utils.h" -#include "BKE_animsys.h" #include "BKE_action.h" +#include "BKE_animsys.h" #include "BKE_appdir.h" #include "BKE_armature.h" #include "BKE_blender_copybuffer.h" @@ -47,10 +47,9 @@ #include "BKE_deform.h" #include "BKE_global.h" #include "BKE_idprop.h" -#include "BKE_library.h" +#include "BKE_layer.h" #include "BKE_main.h" #include "BKE_object.h" -#include "BKE_layer.h" #include "BKE_report.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index 784b8dc0d4e..dce28a1ec5a 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -43,6 +43,8 @@ #include "BLT_translation.h" +#include "BKE_action.h" +#include "BKE_animsys.h" #include "BKE_context.h" #include "BKE_curve.h" #include "BKE_displist.h" @@ -52,10 +54,8 @@ #include "BKE_layer.h" #include "BKE_library.h" #include "BKE_main.h" -#include "BKE_report.h" -#include "BKE_animsys.h" -#include "BKE_action.h" #include "BKE_modifier.h" +#include "BKE_report.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" diff --git a/source/blender/editors/curve/editcurve_add.c b/source/blender/editors/curve/editcurve_add.c index 33d14a1542c..23ce7bac338 100644 --- a/source/blender/editors/curve/editcurve_add.c +++ b/source/blender/editors/curve/editcurve_add.c @@ -42,7 +42,6 @@ #include "BKE_context.h" #include "BKE_curve.h" -#include "BKE_library.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/curve/editcurve_undo.c b/source/blender/editors/curve/editcurve_undo.c index ad17331853b..ebf24446afc 100644 --- a/source/blender/editors/curve/editcurve_undo.c +++ b/source/blender/editors/curve/editcurve_undo.c @@ -34,12 +34,11 @@ #include "BLI_ghash.h" #include "BLI_array_utils.h" +#include "BKE_animsys.h" #include "BKE_context.h" #include "BKE_curve.h" #include "BKE_fcurve.h" #include "BKE_layer.h" -#include "BKE_library.h" -#include "BKE_animsys.h" #include "BKE_undo_system.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/gpencil/gpencil_brush.c b/source/blender/editors/gpencil/gpencil_brush.c index c83bf8b7a5c..ba104a6d57e 100644 --- a/source/blender/editors/gpencil/gpencil_brush.c +++ b/source/blender/editors/gpencil/gpencil_brush.c @@ -56,15 +56,14 @@ #include "DNA_gpencil_types.h" #include "DNA_object_types.h" +#include "BKE_colortools.h" #include "BKE_context.h" #include "BKE_deform.h" #include "BKE_gpencil.h" -#include "BKE_library.h" +#include "BKE_material.h" +#include "BKE_object_deform.h" #include "BKE_report.h" #include "BKE_screen.h" -#include "BKE_object_deform.h" -#include "BKE_colortools.h" -#include "BKE_material.h" #include "UI_interface.h" diff --git a/source/blender/editors/gpencil/gpencil_convert.c b/source/blender/editors/gpencil/gpencil_convert.c index e6246bb8fd4..9ec2915b60c 100644 --- a/source/blender/editors/gpencil/gpencil_convert.c +++ b/source/blender/editors/gpencil/gpencil_convert.c @@ -64,7 +64,6 @@ #include "BKE_global.h" #include "BKE_gpencil.h" #include "BKE_layer.h" -#include "BKE_library.h" #include "BKE_main.h" #include "BKE_object.h" #include "BKE_report.h" diff --git a/source/blender/editors/gpencil/gpencil_data.c b/source/blender/editors/gpencil/gpencil_data.c index 40cff866ffe..23d12b99729 100644 --- a/source/blender/editors/gpencil/gpencil_data.c +++ b/source/blender/editors/gpencil/gpencil_data.c @@ -57,9 +57,8 @@ #include "DNA_space_types.h" #include "DNA_view3d_types.h" -#include "BKE_main.h" -#include "BKE_brush.h" #include "BKE_animsys.h" +#include "BKE_brush.h" #include "BKE_context.h" #include "BKE_deform.h" #include "BKE_fcurve.h" @@ -67,9 +66,10 @@ #include "BKE_gpencil.h" #include "BKE_gpencil_modifier.h" #include "BKE_library.h" +#include "BKE_main.h" +#include "BKE_material.h" #include "BKE_modifier.h" #include "BKE_object.h" -#include "BKE_material.h" #include "BKE_paint.h" #include "BKE_report.h" #include "BKE_scene.h" diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c index 1d29761bb74..7e81e375abd 100644 --- a/source/blender/editors/gpencil/gpencil_edit.c +++ b/source/blender/editors/gpencil/gpencil_edit.c @@ -55,15 +55,15 @@ #include "DNA_view3d_types.h" #include "DNA_gpencil_types.h" -#include "BKE_main.h" +#include "BKE_brush.h" #include "BKE_context.h" #include "BKE_global.h" -#include "BKE_brush.h" #include "BKE_gpencil.h" -#include "BKE_paint.h" #include "BKE_library.h" +#include "BKE_main.h" #include "BKE_material.h" #include "BKE_object.h" +#include "BKE_paint.h" #include "BKE_report.h" #include "BKE_screen.h" #include "BKE_workspace.h" diff --git a/source/blender/editors/gpencil/gpencil_interpolate.c b/source/blender/editors/gpencil/gpencil_interpolate.c index 1b7acbd4132..ae1d1454eae 100644 --- a/source/blender/editors/gpencil/gpencil_interpolate.c +++ b/source/blender/editors/gpencil/gpencil_interpolate.c @@ -56,12 +56,11 @@ #include "BKE_colortools.h" #include "BKE_context.h" +#include "BKE_deform.h" #include "BKE_global.h" #include "BKE_gpencil.h" -#include "BKE_library.h" #include "BKE_report.h" #include "BKE_screen.h" -#include "BKE_deform.h" #include "UI_interface.h" #include "UI_resources.h" diff --git a/source/blender/editors/gpencil/gpencil_primitive.c b/source/blender/editors/gpencil/gpencil_primitive.c index 5f50c2f7a82..0e15e9f0a4e 100644 --- a/source/blender/editors/gpencil/gpencil_primitive.c +++ b/source/blender/editors/gpencil/gpencil_primitive.c @@ -53,13 +53,12 @@ #include "DNA_space_types.h" #include "DNA_view3d_types.h" -#include "BKE_main.h" #include "BKE_brush.h" #include "BKE_context.h" #include "BKE_deform.h" #include "BKE_global.h" #include "BKE_gpencil.h" -#include "BKE_library.h" +#include "BKE_main.h" #include "BKE_material.h" #include "BKE_paint.h" #include "BKE_report.h" diff --git a/source/blender/editors/interface/interface_ops.c b/source/blender/editors/interface/interface_ops.c index 0b7d92939a6..e2e6cc78309 100644 --- a/source/blender/editors/interface/interface_ops.c +++ b/source/blender/editors/interface/interface_ops.c @@ -42,15 +42,15 @@ #include "BLT_lang.h" #include "BKE_context.h" +#include "BKE_global.h" #include "BKE_idprop.h" #include "BKE_layer.h" -#include "BKE_screen.h" -#include "BKE_global.h" #include "BKE_library.h" #include "BKE_library_override.h" #include "BKE_node.h" -#include "BKE_text.h" /* for UI_OT_reports_to_text */ #include "BKE_report.h" +#include "BKE_screen.h" +#include "BKE_text.h" /* for UI_OT_reports_to_text */ #include "DEG_depsgraph.h" diff --git a/source/blender/editors/interface/interface_region_tooltip.c b/source/blender/editors/interface/interface_region_tooltip.c index c54ee1378e7..d1874d5298b 100644 --- a/source/blender/editors/interface/interface_region_tooltip.c +++ b/source/blender/editors/interface/interface_region_tooltip.c @@ -54,9 +54,8 @@ #include "BLI_utildefines.h" #include "BKE_context.h" -#include "BKE_screen.h" -#include "BKE_library.h" #include "BKE_paint.h" +#include "BKE_screen.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 57e7188d1c5..f1c9a7d200e 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -71,8 +71,8 @@ #include "BKE_modifier.h" #include "BKE_object.h" #include "BKE_packedFile.h" -#include "BKE_particle.h" #include "BKE_paint.h" +#include "BKE_particle.h" #include "BKE_report.h" #include "BKE_screen.h" #include "BKE_shader_fx.h" diff --git a/source/blender/editors/io/io_alembic.c b/source/blender/editors/io/io_alembic.c index 02d52d5bdd1..8e446c73eab 100644 --- a/source/blender/editors/io/io_alembic.c +++ b/source/blender/editors/io/io_alembic.c @@ -48,7 +48,6 @@ #include "BKE_context.h" #include "BKE_global.h" -#include "BKE_library.h" #include "BKE_main.h" #include "BKE_report.h" diff --git a/source/blender/editors/io/io_collada.c b/source/blender/editors/io/io_collada.c index 1ac3ca15c83..554480be72a 100644 --- a/source/blender/editors/io/io_collada.c +++ b/source/blender/editors/io/io_collada.c @@ -37,10 +37,9 @@ #include "BKE_context.h" #include "BKE_global.h" -#include "BKE_library.h" #include "BKE_main.h" -#include "BKE_report.h" #include "BKE_object.h" +#include "BKE_report.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/mesh/editmesh_add.c b/source/blender/editors/mesh/editmesh_add.c index b2f0ecc55c6..ae9b8898eb2 100644 --- a/source/blender/editors/mesh/editmesh_add.c +++ b/source/blender/editors/mesh/editmesh_add.c @@ -38,7 +38,6 @@ #include "BLT_translation.h" #include "BKE_context.h" -#include "BKE_library.h" #include "BKE_editmesh.h" #include "RNA_define.h" diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 6300e7a6b2f..ac600a3ca2d 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -52,17 +52,17 @@ #include "BLI_sort_utils.h" #include "BLI_string.h" -#include "BKE_layer.h" -#include "BKE_material.h" +#include "BKE_editmesh.h" #include "BKE_context.h" #include "BKE_deform.h" -#include "BKE_report.h" -#include "BKE_texture.h" +#include "BKE_key.h" +#include "BKE_layer.h" #include "BKE_library.h" #include "BKE_main.h" +#include "BKE_material.h" #include "BKE_mesh.h" -#include "BKE_editmesh.h" -#include "BKE_key.h" +#include "BKE_report.h" +#include "BKE_texture.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" diff --git a/source/blender/editors/mesh/mesh_data.c b/source/blender/editors/mesh/mesh_data.c index 2a918560ba8..fef4314019f 100644 --- a/source/blender/editors/mesh/mesh_data.c +++ b/source/blender/editors/mesh/mesh_data.c @@ -42,12 +42,10 @@ #include "BLI_math.h" #include "BKE_context.h" -#include "BKE_library.h" -#include "BKE_main.h" +#include "BKE_editmesh.h" #include "BKE_mesh.h" #include "BKE_paint.h" #include "BKE_report.h" -#include "BKE_editmesh.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/mesh/mesh_mirror.c b/source/blender/editors/mesh/mesh_mirror.c index f37ad9a7439..b9479a660f9 100644 --- a/source/blender/editors/mesh/mesh_mirror.c +++ b/source/blender/editors/mesh/mesh_mirror.c @@ -35,9 +35,8 @@ #include "DNA_meshdata_types.h" #include "DNA_object_types.h" -#include "BLI_kdtree.h" #include "BKE_editmesh.h" -#include "BKE_library.h" +#include "BLI_kdtree.h" #include "BKE_mesh.h" #include "ED_mesh.h" diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c index 84f209b5889..32eaa578be1 100644 --- a/source/blender/editors/mesh/meshtools.c +++ b/source/blender/editors/mesh/meshtools.c @@ -50,19 +50,19 @@ #include "BKE_context.h" #include "BKE_deform.h" +#include "BKE_editmesh.h" #include "BKE_key.h" +#include "BKE_layer.h" #include "BKE_library.h" #include "BKE_main.h" +#include "BKE_material.h" #include "BKE_mesh.h" #include "BKE_mesh_iterators.h" #include "BKE_mesh_runtime.h" -#include "BKE_material.h" +#include "BKE_multires.h" #include "BKE_object.h" #include "BKE_object_deform.h" #include "BKE_report.h" -#include "BKE_editmesh.h" -#include "BKE_multires.h" -#include "BKE_layer.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index f14779acd21..c0a11f9dece 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -71,13 +71,13 @@ #include "BKE_effect.h" #include "BKE_font.h" #include "BKE_gpencil.h" +#include "BKE_key.h" #include "BKE_lamp.h" #include "BKE_lattice.h" #include "BKE_layer.h" #include "BKE_library.h" #include "BKE_library_query.h" #include "BKE_library_remap.h" -#include "BKE_key.h" #include "BKE_main.h" #include "BKE_material.h" #include "BKE_mball.h" diff --git a/source/blender/editors/object/object_bake_api.c b/source/blender/editors/object/object_bake_api.c index cc9f21df3f9..2f879937f7a 100644 --- a/source/blender/editors/object/object_bake_api.c +++ b/source/blender/editors/object/object_bake_api.c @@ -53,10 +53,10 @@ #include "BKE_library.h" #include "BKE_main.h" #include "BKE_material.h" +#include "BKE_mesh.h" +#include "BKE_modifier.h" #include "BKE_node.h" #include "BKE_report.h" -#include "BKE_modifier.h" -#include "BKE_mesh.h" #include "BKE_scene.h" #include "BKE_screen.h" diff --git a/source/blender/editors/object/object_collection.c b/source/blender/editors/object/object_collection.c index 8386b1fc520..57f1ad7dea1 100644 --- a/source/blender/editors/object/object_collection.c +++ b/source/blender/editors/object/object_collection.c @@ -44,8 +44,8 @@ #include "BKE_library.h" #include "BKE_library_remap.h" #include "BKE_main.h" -#include "BKE_report.h" #include "BKE_object.h" +#include "BKE_report.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index a934f298583..aa148512e16 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -67,25 +67,25 @@ #include "BKE_constraint.h" #include "BKE_context.h" #include "BKE_curve.h" +#include "BKE_editlattice.h" #include "BKE_effect.h" #include "BKE_global.h" #include "BKE_image.h" #include "BKE_lattice.h" +#include "BKE_layer.h" #include "BKE_library.h" #include "BKE_main.h" #include "BKE_material.h" #include "BKE_mball.h" #include "BKE_mesh.h" +#include "BKE_modifier.h" #include "BKE_object.h" #include "BKE_paint.h" #include "BKE_pointcache.h" #include "BKE_softbody.h" -#include "BKE_modifier.h" -#include "BKE_editlattice.h" #include "BKE_editmesh.h" #include "BKE_report.h" #include "BKE_workspace.h" -#include "BKE_layer.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index 2b2a6c88bb6..c4385f9896d 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -54,8 +54,8 @@ #include "BKE_animsys.h" #include "BKE_curve.h" #include "BKE_context.h" -#include "BKE_displist.h" #include "BKE_DerivedMesh.h" +#include "BKE_displist.h" #include "BKE_editmesh.h" #include "BKE_effect.h" #include "BKE_global.h" @@ -68,12 +68,12 @@ #include "BKE_mesh_runtime.h" #include "BKE_modifier.h" #include "BKE_multires.h" -#include "BKE_report.h" #include "BKE_object.h" #include "BKE_object_deform.h" #include "BKE_ocean.h" #include "BKE_paint.h" #include "BKE_particle.h" +#include "BKE_report.h" #include "BKE_scene.h" #include "BKE_softbody.h" diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index 42752b76304..12de37a7787 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -69,6 +69,7 @@ #include "BKE_curve.h" #include "BKE_DerivedMesh.h" #include "BKE_displist.h" +#include "BKE_editmesh.h" #include "BKE_global.h" #include "BKE_gpencil.h" #include "BKE_fcurve.h" @@ -92,7 +93,6 @@ #include "BKE_scene.h" #include "BKE_speaker.h" #include "BKE_texture.h" -#include "BKE_editmesh.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" diff --git a/source/blender/editors/object/object_select.c b/source/blender/editors/object/object_select.c index fc4934fe4b3..a50c5a14e06 100644 --- a/source/blender/editors/object/object_select.c +++ b/source/blender/editors/object/object_select.c @@ -53,17 +53,17 @@ #include "BKE_collection.h" #include "BKE_context.h" +#include "BKE_deform.h" #include "BKE_layer.h" +#include "BKE_library.h" #include "BKE_main.h" #include "BKE_material.h" #include "BKE_object.h" -#include "BKE_particle.h" #include "BKE_paint.h" +#include "BKE_particle.h" #include "BKE_report.h" #include "BKE_scene.h" #include "BKE_workspace.h" -#include "BKE_library.h" -#include "BKE_deform.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/object/object_shapekey.c b/source/blender/editors/object/object_shapekey.c index 30fb2896670..7d16898c2a2 100644 --- a/source/blender/editors/object/object_shapekey.c +++ b/source/blender/editors/object/object_shapekey.c @@ -51,12 +51,11 @@ #include "DNA_object_types.h" #include "BKE_context.h" +#include "BKE_curve.h" #include "BKE_key.h" -#include "BKE_library.h" +#include "BKE_lattice.h" #include "BKE_main.h" #include "BKE_object.h" -#include "BKE_lattice.h" -#include "BKE_curve.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c index 72ece2c8bd5..457ff5be4de 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -52,19 +52,18 @@ #include "BLI_task.h" #include "BLI_utildefines.h" +#include "BKE_bvhutils.h" #include "BKE_context.h" #include "BKE_global.h" -#include "BKE_object.h" -#include "BKE_library.h" #include "BKE_main.h" #include "BKE_mesh.h" #include "BKE_mesh_runtime.h" #include "BKE_modifier.h" +#include "BKE_object.h" #include "BKE_particle.h" +#include "BKE_pointcache.h" #include "BKE_report.h" #include "BKE_scene.h" -#include "BKE_bvhutils.h" -#include "BKE_pointcache.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c index 97d257d1609..8006f5071d1 100644 --- a/source/blender/editors/render/render_opengl.c +++ b/source/blender/editors/render/render_opengl.c @@ -49,7 +49,6 @@ #include "BKE_context.h" #include "BKE_global.h" #include "BKE_image.h" -#include "BKE_library.h" #include "BKE_main.h" #include "BKE_report.h" #include "BKE_scene.h" diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c index 1590ca91230..1c2aa4537e9 100644 --- a/source/blender/editors/render/render_preview.c +++ b/source/blender/editors/render/render_preview.c @@ -71,7 +71,6 @@ #include "BKE_icons.h" #include "BKE_lamp.h" #include "BKE_layer.h" -#include "BKE_library.h" #include "BKE_library_remap.h" #include "BKE_main.h" #include "BKE_material.h" diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c index 65c43b4e93c..99abb8b61c7 100644 --- a/source/blender/editors/render/render_shading.c +++ b/source/blender/editors/render/render_shading.c @@ -51,6 +51,7 @@ #include "BKE_animsys.h" #include "BKE_context.h" #include "BKE_curve.h" +#include "BKE_editmesh.h" #include "BKE_font.h" #include "BKE_global.h" #include "BKE_image.h" @@ -65,7 +66,6 @@ #include "BKE_texture.h" #include "BKE_workspace.h" #include "BKE_world.h" -#include "BKE_editmesh.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index ccc1d91d2e9..ee949ace18a 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -43,9 +43,9 @@ #include "BLI_utildefines.h" #include "BKE_context.h" +#include "BKE_global.h" #include "BKE_icons.h" #include "BKE_image.h" -#include "BKE_global.h" #include "BKE_layer.h" #include "BKE_library.h" #include "BKE_library_remap.h" diff --git a/source/blender/editors/screen/screendump.c b/source/blender/editors/screen/screendump.c index 7aa75f1fdd1..8e3b32941e5 100644 --- a/source/blender/editors/screen/screendump.c +++ b/source/blender/editors/screen/screendump.c @@ -47,7 +47,6 @@ #include "BKE_context.h" #include "BKE_global.h" #include "BKE_image.h" -#include "BKE_library.h" #include "BKE_main.h" #include "BKE_report.h" diff --git a/source/blender/editors/screen/workspace_edit.c b/source/blender/editors/screen/workspace_edit.c index 31df1a44f89..6c836c9fc08 100644 --- a/source/blender/editors/screen/workspace_edit.c +++ b/source/blender/editors/screen/workspace_edit.c @@ -35,9 +35,9 @@ #include "BKE_blendfile.h" #include "BKE_context.h" #include "BKE_idcode.h" -#include "BKE_main.h" #include "BKE_layer.h" #include "BKE_library.h" +#include "BKE_main.h" #include "BKE_report.h" #include "BKE_scene.h" #include "BKE_screen.h" diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index 5f1fb8c5146..6ed502ec016 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -62,12 +62,12 @@ #include "DNA_node_types.h" #include "DNA_object_types.h" +#include "BKE_brush.h" #include "BKE_camera.h" #include "BKE_colorband.h" #include "BKE_context.h" #include "BKE_colortools.h" #include "BKE_idprop.h" -#include "BKE_brush.h" #include "BKE_image.h" #include "BKE_library.h" #include "BKE_main.h" diff --git a/source/blender/editors/sculpt_paint/paint_ops.c b/source/blender/editors/sculpt_paint/paint_ops.c index 87ea42cabae..0d33098293c 100644 --- a/source/blender/editors/sculpt_paint/paint_ops.c +++ b/source/blender/editors/sculpt_paint/paint_ops.c @@ -39,10 +39,10 @@ #include "BKE_brush.h" #include "BKE_context.h" -#include "BKE_paint.h" #include "BKE_gpencil.h" #include "BKE_library.h" #include "BKE_main.h" +#include "BKE_paint.h" #include "BKE_report.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index 84e189a86bf..bbd2f53ec78 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -52,9 +52,9 @@ #include "DNA_scene_types.h" #include "DNA_brush_types.h" -#include "BKE_pbvh.h" #include "BKE_brush.h" #include "BKE_ccg.h" +#include "BKE_colortools.h" #include "BKE_context.h" #include "BKE_global.h" #include "BKE_image.h" @@ -65,13 +65,13 @@ #include "BKE_mesh_mapping.h" #include "BKE_modifier.h" #include "BKE_multires.h" +#include "BKE_node.h" +#include "BKE_object.h" #include "BKE_paint.h" +#include "BKE_pbvh.h" #include "BKE_report.h" #include "BKE_screen.h" -#include "BKE_node.h" -#include "BKE_object.h" #include "BKE_subsurf.h" -#include "BKE_colortools.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/editors/sound/sound_ops.c b/source/blender/editors/sound/sound_ops.c index 15f688549a8..7f51f9e4149 100644 --- a/source/blender/editors/sound/sound_ops.c +++ b/source/blender/editors/sound/sound_ops.c @@ -49,13 +49,13 @@ #include "BKE_context.h" #include "BKE_fcurve.h" #include "BKE_global.h" -#include "BKE_main.h" -#include "BKE_report.h" #include "BKE_library.h" +#include "BKE_main.h" #include "BKE_packedFile.h" +#include "BKE_report.h" #include "BKE_scene.h" -#include "BKE_sound.h" #include "BKE_sequencer.h" +#include "BKE_sound.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/space_action/action_data.c b/source/blender/editors/space_action/action_data.c index 3f8155627e3..a3773110d0f 100644 --- a/source/blender/editors/space_action/action_data.c +++ b/source/blender/editors/space_action/action_data.c @@ -53,12 +53,12 @@ #include "BKE_animsys.h" #include "BKE_action.h" +#include "BKE_context.h" #include "BKE_fcurve.h" -#include "BKE_library.h" #include "BKE_key.h" +#include "BKE_library.h" #include "BKE_nla.h" #include "BKE_scene.h" -#include "BKE_context.h" #include "BKE_report.h" #include "UI_view2d.h" diff --git a/source/blender/editors/space_action/action_edit.c b/source/blender/editors/space_action/action_edit.c index 1d8766ba773..4cec73f306b 100644 --- a/source/blender/editors/space_action/action_edit.c +++ b/source/blender/editors/space_action/action_edit.c @@ -54,14 +54,12 @@ #include "RNA_enum_types.h" #include "BKE_action.h" +#include "BKE_context.h" #include "BKE_fcurve.h" #include "BKE_gpencil.h" #include "BKE_global.h" #include "BKE_key.h" -#include "BKE_library.h" -#include "BKE_main.h" #include "BKE_nla.h" -#include "BKE_context.h" #include "BKE_report.h" #include "UI_view2d.h" diff --git a/source/blender/editors/space_buttons/buttons_ops.c b/source/blender/editors/space_buttons/buttons_ops.c index 87366e7303f..473deb35aac 100644 --- a/source/blender/editors/space_buttons/buttons_ops.c +++ b/source/blender/editors/space_buttons/buttons_ops.c @@ -44,7 +44,6 @@ #include "BKE_context.h" #include "BKE_global.h" -#include "BKE_library.h" #include "BKE_main.h" #include "BKE_report.h" diff --git a/source/blender/editors/space_clip/clip_editor.c b/source/blender/editors/space_clip/clip_editor.c index 0fb7d63180f..8308c781902 100644 --- a/source/blender/editors/space_clip/clip_editor.c +++ b/source/blender/editors/space_clip/clip_editor.c @@ -50,13 +50,13 @@ #include "BLI_rect.h" #include "BLI_task.h" +#include "BKE_context.h" #include "BKE_global.h" +#include "BKE_library.h" #include "BKE_main.h" #include "BKE_mask.h" #include "BKE_movieclip.h" -#include "BKE_context.h" #include "BKE_tracking.h" -#include "BKE_library.h" #include "IMB_colormanagement.h" diff --git a/source/blender/editors/space_clip/clip_ops.c b/source/blender/editors/space_clip/clip_ops.c index 31fd21081e5..e56ec98a232 100644 --- a/source/blender/editors/space_clip/clip_ops.c +++ b/source/blender/editors/space_clip/clip_ops.c @@ -56,10 +56,10 @@ #include "BKE_context.h" #include "BKE_global.h" -#include "BKE_report.h" #include "BKE_library.h" #include "BKE_main.h" #include "BKE_movieclip.h" +#include "BKE_report.h" #include "BKE_sound.h" #include "BKE_tracking.h" diff --git a/source/blender/editors/space_clip/space_clip.c b/source/blender/editors/space_clip/space_clip.c index c70811860a8..a0b2e95817d 100644 --- a/source/blender/editors/space_clip/space_clip.c +++ b/source/blender/editors/space_clip/space_clip.c @@ -44,10 +44,10 @@ #include "BLI_math.h" #include "BKE_context.h" -#include "BKE_screen.h" #include "BKE_library.h" #include "BKE_movieclip.h" #include "BKE_tracking.h" +#include "BKE_screen.h" #include "IMB_imbuf_types.h" diff --git a/source/blender/editors/space_clip/tracking_ops_solve.c b/source/blender/editors/space_clip/tracking_ops_solve.c index 89dfadc8974..4148b3a0070 100644 --- a/source/blender/editors/space_clip/tracking_ops_solve.c +++ b/source/blender/editors/space_clip/tracking_ops_solve.c @@ -40,11 +40,11 @@ #include "BLI_string.h" #include "BKE_context.h" -#include "BKE_movieclip.h" -#include "BKE_tracking.h" #include "BKE_global.h" -#include "BKE_report.h" #include "BKE_library.h" +#include "BKE_movieclip.h" +#include "BKE_report.h" +#include "BKE_tracking.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/space_file/file_draw.c b/source/blender/editors/space_file/file_draw.c index c32af42b141..2ae432fbc4e 100644 --- a/source/blender/editors/space_file/file_draw.c +++ b/source/blender/editors/space_file/file_draw.c @@ -46,7 +46,6 @@ #include "BKE_context.h" #include "BKE_global.h" -#include "BKE_library.h" #include "BKE_main.h" #include "BLO_readfile.h" diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c index ac8e568de32..92f0ceddc3c 100644 --- a/source/blender/editors/space_file/file_ops.c +++ b/source/blender/editors/space_file/file_ops.c @@ -37,11 +37,10 @@ #include "BKE_appdir.h" #include "BKE_context.h" -#include "BKE_screen.h" #include "BKE_global.h" -#include "BKE_report.h" -#include "BKE_library.h" #include "BKE_main.h" +#include "BKE_report.h" +#include "BKE_screen.h" #ifdef WIN32 # include "BLI_winstuff.h" diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c index 81199ce9ad5..218c7dcdb42 100644 --- a/source/blender/editors/space_file/filelist.c +++ b/source/blender/editors/space_file/filelist.c @@ -65,7 +65,6 @@ #include "BKE_context.h" #include "BKE_global.h" -#include "BKE_library.h" #include "BKE_icons.h" #include "BKE_idcode.h" #include "BKE_main.h" diff --git a/source/blender/editors/space_file/filesel.c b/source/blender/editors/space_file/filesel.c index 5e12b2a1bf1..cb014f30d95 100644 --- a/source/blender/editors/space_file/filesel.c +++ b/source/blender/editors/space_file/filesel.c @@ -61,7 +61,6 @@ #include "BKE_appdir.h" #include "BKE_context.h" #include "BKE_global.h" -#include "BKE_library.h" #include "BKE_main.h" #include "BLF_api.h" diff --git a/source/blender/editors/space_image/image_edit.c b/source/blender/editors/space_image/image_edit.c index cde89230df8..96c3f55df92 100644 --- a/source/blender/editors/space_image/image_edit.c +++ b/source/blender/editors/space_image/image_edit.c @@ -38,9 +38,9 @@ #include "BKE_colortools.h" #include "BKE_context.h" +#include "BKE_editmesh.h" #include "BKE_global.h" #include "BKE_image.h" -#include "BKE_editmesh.h" #include "BKE_library.h" #include "BKE_main.h" diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c index 21b46dd8000..2854f52ac18 100644 --- a/source/blender/editors/space_image/space_image.c +++ b/source/blender/editors/space_image/space_image.c @@ -48,9 +48,9 @@ #include "BKE_image.h" #include "BKE_layer.h" #include "BKE_library.h" +#include "BKE_material.h" #include "BKE_scene.h" #include "BKE_screen.h" -#include "BKE_material.h" #include "BKE_workspace.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/space_logic/space_logic.c b/source/blender/editors/space_logic/space_logic.c index 6d484b4cb4c..531d85f517f 100644 --- a/source/blender/editors/space_logic/space_logic.c +++ b/source/blender/editors/space_logic/space_logic.c @@ -41,7 +41,6 @@ #include "DNA_gpencil_types.h" #include "BKE_context.h" -#include "BKE_library.h" #include "BKE_screen.h" #include "ED_space_api.h" diff --git a/source/blender/editors/space_nla/nla_edit.c b/source/blender/editors/space_nla/nla_edit.c index 724a1c072bd..edbdefdcf22 100644 --- a/source/blender/editors/space_nla/nla_edit.c +++ b/source/blender/editors/space_nla/nla_edit.c @@ -46,11 +46,11 @@ #include "BLT_translation.h" #include "BKE_action.h" -#include "BKE_fcurve.h" -#include "BKE_nla.h" #include "BKE_context.h" +#include "BKE_fcurve.h" #include "BKE_library.h" #include "BKE_main.h" +#include "BKE_nla.h" #include "BKE_report.h" #include "BKE_screen.h" diff --git a/source/blender/editors/space_outliner/outliner_dragdrop.c b/source/blender/editors/space_outliner/outliner_dragdrop.c index e31d25f2f47..2217048aca7 100644 --- a/source/blender/editors/space_outliner/outliner_dragdrop.c +++ b/source/blender/editors/space_outliner/outliner_dragdrop.c @@ -49,9 +49,9 @@ #include "BKE_library.h" #include "BKE_main.h" #include "BKE_material.h" +#include "BKE_object.h" #include "BKE_report.h" #include "BKE_scene.h" -#include "BKE_object.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index 9c9e2facec8..da26aab93b5 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -51,16 +51,16 @@ #include "BKE_context.h" #include "BKE_deform.h" #include "BKE_fcurve.h" -#include "BKE_gpencil.h" #include "BKE_global.h" +#include "BKE_gpencil.h" #include "BKE_idcode.h" #include "BKE_layer.h" #include "BKE_library.h" #include "BKE_main.h" #include "BKE_modifier.h" +#include "BKE_object.h" #include "BKE_report.h" #include "BKE_scene.h" -#include "BKE_object.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" diff --git a/source/blender/editors/space_outliner/outliner_edit.c b/source/blender/editors/space_outliner/outliner_edit.c index b845e5c4d40..7cee70def37 100644 --- a/source/blender/editors/space_outliner/outliner_edit.c +++ b/source/blender/editors/space_outliner/outliner_edit.c @@ -58,10 +58,10 @@ #include "BKE_library_query.h" #include "BKE_library_remap.h" #include "BKE_main.h" +#include "BKE_material.h" #include "BKE_outliner_treehash.h" #include "BKE_report.h" #include "BKE_scene.h" -#include "BKE_material.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c index 49accadbb3a..74510c3b02f 100644 --- a/source/blender/editors/space_outliner/outliner_tree.c +++ b/source/blender/editors/space_outliner/outliner_tree.c @@ -63,13 +63,13 @@ #include "BLT_translation.h" #include "BKE_fcurve.h" -#include "BKE_main.h" +#include "BKE_idcode.h" #include "BKE_layer.h" #include "BKE_library.h" +#include "BKE_main.h" #include "BKE_modifier.h" -#include "BKE_sequencer.h" -#include "BKE_idcode.h" #include "BKE_outliner_treehash.h" +#include "BKE_sequencer.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c index 18fd1eae417..d814a27c282 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.c +++ b/source/blender/editors/space_sequencer/sequencer_add.c @@ -48,10 +48,10 @@ #include "BKE_global.h" #include "BKE_library.h" #include "BKE_main.h" -#include "BKE_sequencer.h" -#include "BKE_movieclip.h" #include "BKE_mask.h" +#include "BKE_movieclip.h" #include "BKE_report.h" +#include "BKE_sequencer.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index 1e30287336e..e01d36388f8 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -47,7 +47,6 @@ #include "BKE_context.h" #include "BKE_global.h" -#include "BKE_library.h" #include "BKE_main.h" #include "BKE_report.h" #include "BKE_sequencer.h" diff --git a/source/blender/editors/space_sequencer/space_sequencer.c b/source/blender/editors/space_sequencer/space_sequencer.c index 3f2df976d5f..0dd7848699a 100644 --- a/source/blender/editors/space_sequencer/space_sequencer.c +++ b/source/blender/editors/space_sequencer/space_sequencer.c @@ -42,10 +42,10 @@ #include "BLI_utildefines.h" #include "BKE_context.h" +#include "BKE_global.h" #include "BKE_library.h" #include "BKE_screen.h" #include "BKE_sequencer.h" -#include "BKE_global.h" #include "ED_space_api.h" #include "ED_screen.h" diff --git a/source/blender/editors/space_text/text_undo.c b/source/blender/editors/space_text/text_undo.c index 729522cc8f4..b8ae9972eec 100644 --- a/source/blender/editors/space_text/text_undo.c +++ b/source/blender/editors/space_text/text_undo.c @@ -37,7 +37,6 @@ #include "PIL_time.h" #include "BKE_context.h" -#include "BKE_library.h" #include "BKE_report.h" #include "BKE_text.h" #include "BKE_undo_system.h" diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c index 04eec211338..8fe4a95927d 100644 --- a/source/blender/editors/space_view3d/space_view3d.c +++ b/source/blender/editors/space_view3d/space_view3d.c @@ -48,7 +48,6 @@ #include "BKE_curve.h" #include "BKE_icons.h" #include "BKE_lattice.h" -#include "BKE_library.h" #include "BKE_main.h" #include "BKE_mball.h" #include "BKE_mesh.h" diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index 0174e139c0a..53442ff86fb 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -48,6 +48,7 @@ #include "BLI_math.h" #include "BLI_utildefines.h" +#include "BKE_action.h" #include "BKE_armature.h" #include "BKE_camera.h" #include "BKE_context.h" @@ -61,7 +62,6 @@ #include "BKE_report.h" #include "BKE_scene.h" #include "BKE_screen.h" -#include "BKE_action.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 61b18a16eba..cc7dccbb874 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -69,25 +69,24 @@ #include "BIK_api.h" -#include "BKE_animsys.h" #include "BKE_action.h" +#include "BKE_animsys.h" #include "BKE_armature.h" +#include "BKE_context.h" #include "BKE_curve.h" +#include "BKE_editmesh.h" #include "BKE_fcurve.h" #include "BKE_gpencil.h" #include "BKE_lattice.h" +#include "BKE_layer.h" #include "BKE_library.h" -#include "BKE_main.h" +#include "BKE_mask.h" #include "BKE_nla.h" -#include "BKE_context.h" #include "BKE_paint.h" +#include "BKE_scene.h" #include "BKE_sequencer.h" -#include "BKE_editmesh.h" #include "BKE_tracking.h" -#include "BKE_mask.h" #include "BKE_workspace.h" -#include "BKE_layer.h" -#include "BKE_scene.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/util/ed_util.c b/source/blender/editors/util/ed_util.c index 50428a1ca9d..f316b1a61cb 100644 --- a/source/blender/editors/util/ed_util.c +++ b/source/blender/editors/util/ed_util.c @@ -54,7 +54,6 @@ #include "BKE_context.h" #include "BKE_global.h" #include "BKE_layer.h" -#include "BKE_library.h" #include "BKE_main.h" #include "BKE_multires.h" #include "BKE_object.h" diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index de17c20f68a..9bf1bb3df20 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -58,8 +58,9 @@ #include "BKE_context.h" #include "BKE_customdata.h" +#include "BKE_editmesh.h" #include "BKE_image.h" -#include "BKE_library.h" +#include "BKE_layer.h" #include "BKE_main.h" #include "BKE_material.h" #include "BKE_mesh.h" @@ -67,8 +68,6 @@ #include "BKE_node.h" #include "BKE_report.h" #include "BKE_scene.h" -#include "BKE_editmesh.h" -#include "BKE_layer.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp index 6d911ea04d2..0548d49dce0 100644 --- a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp +++ b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp @@ -46,13 +46,12 @@ extern "C" { #include "DNA_material_types.h" #include "DNA_text_types.h" +#include "BKE_context.h" #include "BKE_freestyle.h" #include "BKE_global.h" #include "BKE_library.h" #include "BKE_linestyle.h" -#include "BKE_main.h" #include "BKE_text.h" -#include "BKE_context.h" #include "BLT_translation.h" diff --git a/source/blender/imbuf/intern/thumbs_blend.c b/source/blender/imbuf/intern/thumbs_blend.c index 9cf1b96635b..5bdab03e57c 100644 --- a/source/blender/imbuf/intern/thumbs_blend.c +++ b/source/blender/imbuf/intern/thumbs_blend.c @@ -39,7 +39,6 @@ #include "BKE_idcode.h" #include "BKE_icons.h" -#include "BKE_library.h" #include "BKE_main.h" #include "DNA_ID.h" /* For preview images... */ diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c index 33246ba4a30..f52e13ba1c9 100644 --- a/source/blender/makesrna/intern/rna_access.c +++ b/source/blender/makesrna/intern/rna_access.c @@ -56,7 +56,6 @@ #include "BKE_idcode.h" #include "BKE_idprop.h" #include "BKE_fcurve.h" -#include "BKE_library.h" #include "BKE_library_override.h" #include "BKE_main.h" #include "BKE_report.h" diff --git a/source/blender/makesrna/intern/rna_collection.c b/source/blender/makesrna/intern/rna_collection.c index 57084d1b187..2279dc6880d 100644 --- a/source/blender/makesrna/intern/rna_collection.c +++ b/source/blender/makesrna/intern/rna_collection.c @@ -47,7 +47,6 @@ #include "BKE_collection.h" #include "BKE_global.h" #include "BKE_layer.h" -#include "BKE_library.h" #include "WM_api.h" diff --git a/source/blender/makesrna/intern/rna_gpencil_modifier.c b/source/blender/makesrna/intern/rna_gpencil_modifier.c index fc3a5917a66..dc13f099e11 100644 --- a/source/blender/makesrna/intern/rna_gpencil_modifier.c +++ b/source/blender/makesrna/intern/rna_gpencil_modifier.c @@ -120,7 +120,6 @@ static const EnumPropertyItem rna_enum_time_mode_items[] = { #include "BKE_cachefile.h" #include "BKE_context.h" -#include "BKE_library.h" #include "BKE_gpencil_modifier.h" #include "BKE_object.h" #include "BKE_gpencil.h" diff --git a/source/blender/makesrna/intern/rna_main_api.c b/source/blender/makesrna/intern/rna_main_api.c index 59c9e523914..c6094dc2dc3 100644 --- a/source/blender/makesrna/intern/rna_main_api.c +++ b/source/blender/makesrna/intern/rna_main_api.c @@ -49,41 +49,39 @@ #ifdef RNA_RUNTIME -#include "BKE_main.h" +#include "BKE_action.h" +#include "BKE_armature.h" +#include "BKE_brush.h" #include "BKE_camera.h" #include "BKE_collection.h" #include "BKE_curve.h" #include "BKE_displist.h" -#include "BKE_mesh.h" -#include "BKE_armature.h" -#include "BKE_lamp.h" -#include "BKE_library.h" -#include "BKE_library_remap.h" -#include "BKE_object.h" -#include "BKE_material.h" +#include "BKE_font.h" +#include "BKE_gpencil.h" #include "BKE_icons.h" #include "BKE_idcode.h" #include "BKE_image.h" -#include "BKE_texture.h" -#include "BKE_scene.h" -#include "BKE_sound.h" -#include "BKE_text.h" -#include "BKE_action.h" -#include "BKE_brush.h" +#include "BKE_lamp.h" #include "BKE_lattice.h" +#include "BKE_library_remap.h" +#include "BKE_lightprobe.h" +#include "BKE_linestyle.h" +#include "BKE_mask.h" +#include "BKE_material.h" #include "BKE_mball.h" -#include "BKE_world.h" -#include "BKE_particle.h" -#include "BKE_paint.h" -#include "BKE_font.h" +#include "BKE_mesh.h" +#include "BKE_movieclip.h" #include "BKE_node.h" +#include "BKE_object.h" +#include "BKE_paint.h" +#include "BKE_particle.h" +#include "BKE_scene.h" +#include "BKE_sound.h" #include "BKE_speaker.h" -#include "BKE_lightprobe.h" -#include "BKE_movieclip.h" -#include "BKE_mask.h" -#include "BKE_gpencil.h" -#include "BKE_linestyle.h" +#include "BKE_text.h" +#include "BKE_texture.h" #include "BKE_workspace.h" +#include "BKE_world.h" #include "DEG_depsgraph_build.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index d450e95d397..b633dd907ae 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -305,7 +305,6 @@ const EnumPropertyItem rna_enum_axis_flag_xyz_items[] = { #include "BKE_cachefile.h" #include "BKE_context.h" -#include "BKE_library.h" #include "BKE_mesh_runtime.h" #include "BKE_modifier.h" #include "BKE_object.h" diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index 642ead3edc0..42abf76901c 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -43,7 +43,6 @@ #include "DNA_texture_types.h" #include "BKE_animsys.h" -#include "BKE_main.h" #include "BKE_node.h" #include "BKE_image.h" #include "BKE_texture.h" @@ -190,7 +189,6 @@ static const EnumPropertyItem prop_shader_output_target_items[] = { #include "BKE_context.h" #include "BKE_idprop.h" -#include "BKE_library.h" #include "BKE_global.h" diff --git a/source/blender/makesrna/intern/rna_sequencer_api.c b/source/blender/makesrna/intern/rna_sequencer_api.c index 509b6da2048..4c56f4c7ccd 100644 --- a/source/blender/makesrna/intern/rna_sequencer_api.c +++ b/source/blender/makesrna/intern/rna_sequencer_api.c @@ -48,9 +48,8 @@ #include "BLI_path_util.h" /* BLI_split_dirfile */ #include "BKE_image.h" -#include "BKE_library.h" /* id_us_plus */ -#include "BKE_movieclip.h" #include "BKE_mask.h" +#include "BKE_movieclip.h" #include "BKE_report.h" #include "BKE_sequencer.h" diff --git a/source/blender/modifiers/intern/MOD_boolean.c b/source/blender/modifiers/intern/MOD_boolean.c index 1fce2cf8ed1..7c09f86b4ca 100644 --- a/source/blender/modifiers/intern/MOD_boolean.c +++ b/source/blender/modifiers/intern/MOD_boolean.c @@ -48,10 +48,11 @@ #include "BLI_alloca.h" #include "BLI_math_geom.h" -#include "BKE_material.h" + #include "BKE_global.h" /* only to check G.debug */ -#include "BKE_mesh.h" #include "BKE_library.h" +#include "BKE_material.h" +#include "BKE_mesh.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" diff --git a/source/blender/nodes/shader/node_shader_util.h b/source/blender/nodes/shader/node_shader_util.h index 7fce5ed9927..158efc5a6ab 100644 --- a/source/blender/nodes/shader/node_shader_util.h +++ b/source/blender/nodes/shader/node_shader_util.h @@ -64,8 +64,6 @@ #include "BKE_node.h" #include "BKE_texture.h" -#include "BKE_library.h" - #include "NOD_shader.h" #include "node_util.h" diff --git a/source/blender/nodes/texture/node_texture_util.h b/source/blender/nodes/texture/node_texture_util.h index 63418248b71..6606915c3f7 100644 --- a/source/blender/nodes/texture/node_texture_util.h +++ b/source/blender/nodes/texture/node_texture_util.h @@ -61,7 +61,6 @@ #include "BKE_material.h" #include "BKE_node.h" #include "BKE_texture.h" -#include "BKE_library.h" #include "node_util.h" #include "NOD_texture.h" diff --git a/source/blender/python/bmesh/bmesh_py_types_meshdata.c b/source/blender/python/bmesh/bmesh_py_types_meshdata.c index 9c763eb248e..2a0f3817f35 100644 --- a/source/blender/python/bmesh/bmesh_py_types_meshdata.c +++ b/source/blender/python/bmesh/bmesh_py_types_meshdata.c @@ -42,7 +42,6 @@ #include "BLI_math_vector.h" #include "BKE_deform.h" -#include "BKE_library.h" #include "bmesh_py_types_meshdata.h" diff --git a/source/blender/python/generic/bpy_internal_import.c b/source/blender/python/generic/bpy_internal_import.c index bf77a097914..926de79d0ff 100644 --- a/source/blender/python/generic/bpy_internal_import.c +++ b/source/blender/python/generic/bpy_internal_import.c @@ -43,7 +43,6 @@ #include "BLI_string.h" #include "BLI_utildefines.h" -#include "BKE_library.h" #include "BKE_main.h" /* UNUSED */ #include "BKE_text.h" /* txt_to_buf */ diff --git a/source/blender/python/gpu/gpu_py_batch.c b/source/blender/python/gpu/gpu_py_batch.c index 09e997f073c..b3bdf663621 100644 --- a/source/blender/python/gpu/gpu_py_batch.c +++ b/source/blender/python/gpu/gpu_py_batch.c @@ -37,7 +37,6 @@ #include "BLI_utildefines.h" #include "BKE_global.h" -#include "BKE_library.h" #include "GPU_batch.h" diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c index d3eaf8ca5af..d915c13fe54 100644 --- a/source/blender/python/intern/bpy_interface.c +++ b/source/blender/python/intern/bpy_interface.c @@ -59,7 +59,6 @@ #include "BKE_appdir.h" #include "BKE_context.h" #include "BKE_global.h" /* only for script checking */ -#include "BKE_library.h" #include "BKE_main.h" #include "BKE_text.h" diff --git a/source/blender/python/intern/bpy_library_load.c b/source/blender/python/intern/bpy_library_load.c index d60c44e702a..f9cd3338cde 100644 --- a/source/blender/python/intern/bpy_library_load.c +++ b/source/blender/python/intern/bpy_library_load.c @@ -38,11 +38,11 @@ #include "BLI_linklist.h" #include "BLI_path_util.h" -#include "BKE_main.h" -#include "BKE_library.h" +#include "BKE_context.h" #include "BKE_idcode.h" +#include "BKE_library.h" +#include "BKE_main.h" #include "BKE_report.h" -#include "BKE_context.h" #include "DNA_space_types.h" /* FILE_LINK, FILE_RELPATH */ diff --git a/source/blender/python/intern/bpy_library_write.c b/source/blender/python/intern/bpy_library_write.c index 76b7ccf72fa..07a81a3bddb 100644 --- a/source/blender/python/intern/bpy_library_write.c +++ b/source/blender/python/intern/bpy_library_write.c @@ -34,7 +34,6 @@ #include "BLI_string.h" #include "BLI_path_util.h" -#include "BKE_library.h" #include "BKE_blendfile.h" #include "BKE_global.h" #include "BKE_main.h" diff --git a/source/blender/python/intern/bpy_rna_id_collection.c b/source/blender/python/intern/bpy_rna_id_collection.c index 4806c2266ba..0aed853c66b 100644 --- a/source/blender/python/intern/bpy_rna_id_collection.c +++ b/source/blender/python/intern/bpy_rna_id_collection.c @@ -35,9 +35,8 @@ #include "BLI_bitmap.h" #include "BKE_global.h" -#include "BKE_main.h" -#include "BKE_library.h" #include "BKE_library_query.h" +#include "BKE_main.h" #include "DNA_ID.h" /* Those folowing are only to support hack of not listing some internal 'backward' pointers in generated user_map... */ diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 81679caddd9..a30a72d9dc8 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -70,16 +70,15 @@ #include "BKE_layer.h" #include "BKE_library.h" #include "BKE_library_remap.h" -#include "BKE_main.h" #include "BKE_modifier.h" #include "BKE_node.h" +#include "BKE_object.h" #include "BKE_pointcache.h" #include "BKE_report.h" #include "BKE_scene.h" #include "BKE_sequencer.h" #include "BKE_sound.h" #include "BKE_writeavi.h" /* <------ should be replaced once with generic movie module */ -#include "BKE_object.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/source/render_result.c index 5f46d061f8e..ea5ca18d58a 100644 --- a/source/blender/render/intern/source/render_result.c +++ b/source/blender/render/intern/source/render_result.c @@ -48,8 +48,6 @@ #include "BKE_camera.h" #include "BKE_global.h" #include "BKE_image.h" -#include "BKE_library.h" -#include "BKE_main.h" #include "BKE_report.h" #include "BKE_scene.h" diff --git a/source/blender/windowmanager/intern/wm.c b/source/blender/windowmanager/intern/wm.c index 7247529d02d..cf7c43ff5c0 100644 --- a/source/blender/windowmanager/intern/wm.c +++ b/source/blender/windowmanager/intern/wm.c @@ -46,12 +46,12 @@ #include "BLI_ghash.h" #include "BKE_context.h" +#include "BKE_global.h" #include "BKE_idprop.h" #include "BKE_library.h" #include "BKE_main.h" -#include "BKE_screen.h" #include "BKE_report.h" -#include "BKE_global.h" +#include "BKE_screen.h" #include "BKE_workspace.h" #include "WM_api.h" diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index a1a20397f99..60d64e6ea5b 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -79,7 +79,6 @@ #include "BKE_blender_undo.h" #include "BKE_context.h" #include "BKE_global.h" -#include "BKE_library.h" #include "BKE_main.h" #include "BKE_packedFile.h" #include "BKE_report.h" diff --git a/source/blender/windowmanager/intern/wm_files_link.c b/source/blender/windowmanager/intern/wm_files_link.c index a1e298b91d0..0b1ba6cf32d 100644 --- a/source/blender/windowmanager/intern/wm_files_link.c +++ b/source/blender/windowmanager/intern/wm_files_link.c @@ -59,10 +59,10 @@ #include "BLO_readfile.h" #include "BKE_context.h" +#include "BKE_global.h" #include "BKE_layer.h" #include "BKE_library.h" #include "BKE_library_remap.h" -#include "BKE_global.h" #include "BKE_main.h" #include "BKE_report.h" #include "BKE_scene.h" diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index fb7b6078c5f..52f609700b3 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -61,16 +61,15 @@ #include "BKE_blender.h" #include "BKE_blender_undo.h" #include "BKE_context.h" -#include "BKE_screen.h" +#include "BKE_font.h" #include "BKE_global.h" #include "BKE_icons.h" -#include "BKE_library.h" #include "BKE_library_remap.h" #include "BKE_main.h" #include "BKE_mball_tessellate.h" #include "BKE_node.h" #include "BKE_report.h" -#include "BKE_font.h" +#include "BKE_screen.h" #include "BKE_addon.h" #include "BKE_appdir.h" diff --git a/source/blender/windowmanager/intern/wm_menu_type.c b/source/blender/windowmanager/intern/wm_menu_type.c index 97ca5690954..c8bce13b27c 100644 --- a/source/blender/windowmanager/intern/wm_menu_type.c +++ b/source/blender/windowmanager/intern/wm_menu_type.c @@ -35,7 +35,6 @@ #include "BLI_ghash.h" #include "BKE_context.h" -#include "BKE_library.h" #include "BKE_screen.h" #include "BKE_workspace.h" diff --git a/source/blender/windowmanager/intern/wm_operator_type.c b/source/blender/windowmanager/intern/wm_operator_type.c index 89421ac0ab0..33613d97f03 100644 --- a/source/blender/windowmanager/intern/wm_operator_type.c +++ b/source/blender/windowmanager/intern/wm_operator_type.c @@ -42,7 +42,6 @@ #include "BKE_context.h" #include "BKE_idprop.h" -#include "BKE_library.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 6c9cbbcee57..7862ed9fd1b 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -73,12 +73,12 @@ #include "BKE_blender_version.h" #include "BKE_brush.h" #include "BKE_context.h" +#include "BKE_global.h" #include "BKE_icons.h" #include "BKE_idprop.h" #include "BKE_image.h" #include "BKE_library.h" #include "BKE_library_query.h" -#include "BKE_global.h" #include "BKE_main.h" #include "BKE_material.h" #include "BKE_report.h" diff --git a/source/blender/windowmanager/intern/wm_toolsystem.c b/source/blender/windowmanager/intern/wm_toolsystem.c index 565d52c230b..333b71fead6 100644 --- a/source/blender/windowmanager/intern/wm_toolsystem.c +++ b/source/blender/windowmanager/intern/wm_toolsystem.c @@ -43,10 +43,10 @@ #include "BKE_brush.h" #include "BKE_context.h" +#include "BKE_idprop.h" #include "BKE_library.h" #include "BKE_main.h" #include "BKE_paint.h" -#include "BKE_idprop.h" #include "BKE_workspace.h" #include "RNA_access.h" diff --git a/source/blender/windowmanager/intern/wm_uilist_type.c b/source/blender/windowmanager/intern/wm_uilist_type.c index 52619a09218..f0ffa5905fc 100644 --- a/source/blender/windowmanager/intern/wm_uilist_type.c +++ b/source/blender/windowmanager/intern/wm_uilist_type.c @@ -34,7 +34,6 @@ #include "BLI_ghash.h" #include "BKE_context.h" -#include "BKE_library.h" #include "BKE_screen.h" #include "WM_api.h" diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index 679b45628b1..b84b851476a 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -52,10 +52,9 @@ #include "BKE_blender.h" #include "BKE_context.h" +#include "BKE_global.h" #include "BKE_icons.h" #include "BKE_layer.h" -#include "BKE_library.h" -#include "BKE_global.h" #include "BKE_main.h" #include "BKE_screen.h" #include "BKE_workspace.h" diff --git a/source/creator/creator_args.c b/source/creator/creator_args.c index 86eafc1de09..2d24704e09e 100644 --- a/source/creator/creator_args.c +++ b/source/creator/creator_args.c @@ -53,13 +53,13 @@ #include "BKE_context.h" #include "BKE_global.h" +#include "BKE_image.h" #include "BKE_library.h" #include "BKE_library_override.h" #include "BKE_main.h" -#include "BKE_scene.h" #include "BKE_report.h" +#include "BKE_scene.h" #include "BKE_sound.h" -#include "BKE_image.h" #ifdef WITH_FFMPEG #include "IMB_imbuf.h" |