From 2d1cce8331f3ecdfb8cb0c651e111ffac5dc7153 Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Thu, 19 Mar 2020 09:33:03 +0100 Subject: Cleanup: `make format` after SortedIncludes change --- source/blender/blenkernel/intern/CCGSubSurf.c | 6 +- .../blender/blenkernel/intern/CCGSubSurf_legacy.c | 4 +- .../blenkernel/intern/CCGSubSurf_opensubdiv.c | 6 +- .../intern/CCGSubSurf_opensubdiv_converter.c | 4 +- source/blender/blenkernel/intern/CCGSubSurf_util.c | 4 +- source/blender/blenkernel/intern/DerivedMesh.c | 18 +++--- source/blender/blenkernel/intern/action.c | 10 ++-- source/blender/blenkernel/intern/addon.c | 4 +- source/blender/blenkernel/intern/anim.c | 8 +-- source/blender/blenkernel/intern/anim_sys.c | 12 ++-- source/blender/blenkernel/intern/appdir.c | 10 ++-- source/blender/blenkernel/intern/armature.c | 22 ++++---- source/blender/blenkernel/intern/armature_update.c | 2 +- source/blender/blenkernel/intern/autoexec.c | 2 +- source/blender/blenkernel/intern/blender.c | 8 +-- .../blender/blenkernel/intern/blender_copybuffer.c | 2 +- source/blender/blenkernel/intern/blender_undo.c | 10 ++-- source/blender/blenkernel/intern/blendfile.c | 2 +- source/blender/blenkernel/intern/boids.c | 8 +-- source/blender/blenkernel/intern/bpath.c | 16 +++--- source/blender/blenkernel/intern/brush.c | 8 +-- source/blender/blenkernel/intern/bvhutils.c | 6 +- source/blender/blenkernel/intern/cachefile.c | 2 +- source/blender/blenkernel/intern/callbacks.c | 4 +- source/blender/blenkernel/intern/camera.c | 10 ++-- source/blender/blenkernel/intern/cdderivedmesh.c | 10 ++-- source/blender/blenkernel/intern/cloth.c | 12 ++-- source/blender/blenkernel/intern/collection.c | 2 +- source/blender/blenkernel/intern/collision.c | 10 ++-- source/blender/blenkernel/intern/colorband.c | 6 +- source/blender/blenkernel/intern/colortools.c | 6 +- source/blender/blenkernel/intern/constraint.c | 18 +++--- source/blender/blenkernel/intern/context.c | 10 ++-- source/blender/blenkernel/intern/crazyspace.c | 16 +++--- source/blender/blenkernel/intern/curve.c | 12 ++-- source/blender/blenkernel/intern/curve_decimate.c | 2 +- source/blender/blenkernel/intern/curveprofile.c | 10 ++-- source/blender/blenkernel/intern/customdata.c | 10 ++-- source/blender/blenkernel/intern/customdata_file.c | 4 +- source/blender/blenkernel/intern/data_transfer.c | 6 +- source/blender/blenkernel/intern/deform.c | 8 +-- source/blender/blenkernel/intern/displist.c | 14 ++--- source/blender/blenkernel/intern/dynamicpaint.c | 4 +- source/blender/blenkernel/intern/editlattice.c | 8 +-- source/blender/blenkernel/intern/editmesh.c | 2 +- source/blender/blenkernel/intern/editmesh_bvh.c | 2 +- .../blender/blenkernel/intern/editmesh_tangent.c | 6 +- source/blender/blenkernel/intern/effect.c | 12 ++-- source/blender/blenkernel/intern/fcurve.c | 18 +++--- source/blender/blenkernel/intern/fluid.c | 2 +- source/blender/blenkernel/intern/fmodifier.c | 6 +- source/blender/blenkernel/intern/font.c | 24 ++++---- source/blender/blenkernel/intern/gpencil.c | 20 +++---- .../blender/blenkernel/intern/gpencil_modifier.c | 16 +++--- source/blender/blenkernel/intern/hair.c | 2 +- source/blender/blenkernel/intern/icons.c | 6 +- source/blender/blenkernel/intern/icons_rasterize.c | 2 +- source/blender/blenkernel/intern/idcode.c | 2 +- source/blender/blenkernel/intern/idprop.c | 6 +- source/blender/blenkernel/intern/idprop_utils.c | 6 +- source/blender/blenkernel/intern/image.c | 26 ++++----- source/blender/blenkernel/intern/ipo.c | 14 ++--- source/blender/blenkernel/intern/key.c | 6 +- source/blender/blenkernel/intern/keyconfig.c | 4 +- source/blender/blenkernel/intern/lattice.c | 20 +++---- source/blender/blenkernel/intern/layer.c | 4 +- source/blender/blenkernel/intern/layer_utils.c | 2 +- source/blender/blenkernel/intern/lib_id.c | 32 +++++------ source/blender/blenkernel/intern/lib_id_delete.c | 26 ++++----- source/blender/blenkernel/intern/lib_override.c | 2 +- source/blender/blenkernel/intern/lib_query.c | 12 ++-- source/blender/blenkernel/intern/lib_remap.c | 2 +- source/blender/blenkernel/intern/light.c | 4 +- source/blender/blenkernel/intern/lightprobe.c | 4 +- source/blender/blenkernel/intern/linestyle.c | 8 +-- source/blender/blenkernel/intern/main_idmap.c | 4 +- source/blender/blenkernel/intern/mask.c | 12 ++-- source/blender/blenkernel/intern/mask_evaluate.c | 2 +- source/blender/blenkernel/intern/mask_rasterize.c | 10 ++-- source/blender/blenkernel/intern/material.c | 24 ++++---- source/blender/blenkernel/intern/mball.c | 18 +++--- .../blender/blenkernel/intern/mball_tessellate.c | 12 ++-- source/blender/blenkernel/intern/mesh.c | 20 +++---- source/blender/blenkernel/intern/mesh_convert.c | 22 ++++---- source/blender/blenkernel/intern/mesh_evaluate.c | 14 ++--- source/blender/blenkernel/intern/mesh_mapping.c | 6 +- source/blender/blenkernel/intern/mesh_merge.c | 4 +- source/blender/blenkernel/intern/mesh_mirror.c | 2 +- source/blender/blenkernel/intern/mesh_remap.c | 2 +- .../blender/blenkernel/intern/mesh_remesh_voxel.c | 16 +++--- source/blender/blenkernel/intern/mesh_runtime.c | 2 +- source/blender/blenkernel/intern/mesh_tangent.c | 4 +- source/blender/blenkernel/intern/mesh_validate.c | 4 +- source/blender/blenkernel/intern/modifier.c | 14 ++--- source/blender/blenkernel/intern/movieclip.c | 10 ++-- source/blender/blenkernel/intern/multires.c | 6 +- .../intern/multires_reshape_apply_base.c | 4 +- .../blenkernel/intern/multires_reshape_smooth.c | 2 +- .../blenkernel/intern/multires_reshape_util.c | 4 +- source/blender/blenkernel/intern/nla.c | 10 ++-- source/blender/blenkernel/intern/node.c | 10 ++-- source/blender/blenkernel/intern/object.c | 66 +++++++++++----------- source/blender/blenkernel/intern/object_deform.c | 12 ++-- source/blender/blenkernel/intern/object_dupli.c | 8 +-- source/blender/blenkernel/intern/object_facemap.c | 10 ++-- source/blender/blenkernel/intern/object_update.c | 12 ++-- source/blender/blenkernel/intern/ocean_spectrum.c | 2 +- .../blender/blenkernel/intern/outliner_treehash.c | 2 +- source/blender/blenkernel/intern/packedFile.c | 8 +-- source/blender/blenkernel/intern/paint.c | 14 ++--- source/blender/blenkernel/intern/paint_toolslots.c | 6 +- source/blender/blenkernel/intern/particle.c | 22 ++++---- .../blenkernel/intern/particle_distribute.c | 2 +- source/blender/blenkernel/intern/particle_system.c | 32 +++++------ source/blender/blenkernel/intern/pbvh.c | 8 +-- source/blender/blenkernel/intern/pbvh_bmesh.c | 4 +- source/blender/blenkernel/intern/pointcache.c | 10 ++-- source/blender/blenkernel/intern/pointcloud.c | 2 +- source/blender/blenkernel/intern/report.c | 4 +- source/blender/blenkernel/intern/rigidbody.c | 12 ++-- source/blender/blenkernel/intern/scene.c | 16 +++--- source/blender/blenkernel/intern/screen.c | 8 +-- source/blender/blenkernel/intern/seqcache.c | 18 +++--- source/blender/blenkernel/intern/seqeffects.c | 14 ++--- source/blender/blenkernel/intern/seqmodifier.c | 6 +- source/blender/blenkernel/intern/seqprefetch.c | 10 ++-- source/blender/blenkernel/intern/sequencer.c | 26 ++++----- source/blender/blenkernel/intern/shader_fx.c | 10 ++-- source/blender/blenkernel/intern/shrinkwrap.c | 22 ++++---- source/blender/blenkernel/intern/softbody.c | 14 ++--- source/blender/blenkernel/intern/sound.c | 18 +++--- source/blender/blenkernel/intern/speaker.c | 2 +- source/blender/blenkernel/intern/studiolight.c | 2 +- .../blenkernel/intern/subdiv_converter_mesh.c | 2 +- source/blender/blenkernel/intern/subdiv_deform.c | 2 +- .../intern/subdiv_displacement_multires.c | 2 +- source/blender/blenkernel/intern/subdiv_eval.c | 2 +- source/blender/blenkernel/intern/subdiv_foreach.c | 4 +- source/blender/blenkernel/intern/subdiv_mesh.c | 4 +- source/blender/blenkernel/intern/subsurf_ccg.c | 10 ++-- source/blender/blenkernel/intern/text.c | 16 +++--- .../blender/blenkernel/intern/text_suggestions.c | 4 +- source/blender/blenkernel/intern/texture.c | 28 ++++----- source/blender/blenkernel/intern/tracking.c | 14 ++--- source/blender/blenkernel/intern/tracking_auto.c | 6 +- .../blenkernel/intern/tracking_plane_tracker.c | 2 +- .../blenkernel/intern/tracking_region_tracker.c | 6 +- source/blender/blenkernel/intern/tracking_solver.c | 6 +- .../blender/blenkernel/intern/tracking_stabilize.c | 16 +++--- source/blender/blenkernel/intern/tracking_util.c | 8 +-- source/blender/blenkernel/intern/undo_system.c | 4 +- source/blender/blenkernel/intern/unit.c | 8 +-- source/blender/blenkernel/intern/volume.cc | 2 +- source/blender/blenkernel/intern/workspace.c | 6 +- source/blender/blenkernel/intern/world.c | 10 ++-- source/blender/blenkernel/intern/writeffmpeg.c | 4 +- 156 files changed, 730 insertions(+), 730 deletions(-) (limited to 'source/blender/blenkernel/intern') diff --git a/source/blender/blenkernel/intern/CCGSubSurf.c b/source/blender/blenkernel/intern/CCGSubSurf.c index d91296e0c01..d76a4d8f859 100644 --- a/source/blender/blenkernel/intern/CCGSubSurf.c +++ b/source/blender/blenkernel/intern/CCGSubSurf.c @@ -18,19 +18,19 @@ * \ingroup bke */ +#include #include #include -#include -#include "MEM_guardedalloc.h" #include "BLI_sys_types.h" // for intptr_t support +#include "MEM_guardedalloc.h" #include "BLI_utildefines.h" /* for BLI_assert */ #include "BKE_ccg.h" +#include "BKE_subsurf.h" #include "CCGSubSurf.h" #include "CCGSubSurf_intern.h" -#include "BKE_subsurf.h" #ifdef WITH_OPENSUBDIV # include "opensubdiv_capi.h" diff --git a/source/blender/blenkernel/intern/CCGSubSurf_legacy.c b/source/blender/blenkernel/intern/CCGSubSurf_legacy.c index 01735b34e5e..f3f681baa01 100644 --- a/source/blender/blenkernel/intern/CCGSubSurf_legacy.c +++ b/source/blender/blenkernel/intern/CCGSubSurf_legacy.c @@ -18,12 +18,12 @@ * \ingroup bke */ -#include "MEM_guardedalloc.h" #include "BLI_sys_types.h" // for intptr_t support +#include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" /* for BLI_assert */ #include "BLI_math.h" #include "BLI_task.h" +#include "BLI_utildefines.h" /* for BLI_assert */ #include "CCGSubSurf.h" #include "CCGSubSurf_intern.h" diff --git a/source/blender/blenkernel/intern/CCGSubSurf_opensubdiv.c b/source/blender/blenkernel/intern/CCGSubSurf_opensubdiv.c index 699075f6cff..3257dd2334c 100644 --- a/source/blender/blenkernel/intern/CCGSubSurf_opensubdiv.c +++ b/source/blender/blenkernel/intern/CCGSubSurf_opensubdiv.c @@ -20,13 +20,13 @@ #ifdef WITH_OPENSUBDIV -# include "MEM_guardedalloc.h" # include "BLI_sys_types.h" // for intptr_t support +# include "MEM_guardedalloc.h" -# include "BLI_utildefines.h" /* for BLI_assert */ # include "BLI_listbase.h" # include "BLI_math.h" # include "BLI_threads.h" +# include "BLI_utildefines.h" /* for BLI_assert */ # include "CCGSubSurf.h" # include "CCGSubSurf_intern.h" @@ -42,8 +42,8 @@ # include "opensubdiv_gl_mesh_capi.h" # include "opensubdiv_topology_refiner_capi.h" -# include "GPU_glew.h" # include "GPU_extensions.h" +# include "GPU_glew.h" # define OSD_LOG \ if (false) \ diff --git a/source/blender/blenkernel/intern/CCGSubSurf_opensubdiv_converter.c b/source/blender/blenkernel/intern/CCGSubSurf_opensubdiv_converter.c index e77b65eca25..16766d52e57 100644 --- a/source/blender/blenkernel/intern/CCGSubSurf_opensubdiv_converter.c +++ b/source/blender/blenkernel/intern/CCGSubSurf_opensubdiv_converter.c @@ -22,11 +22,11 @@ # include -# include "MEM_guardedalloc.h" # include "BLI_sys_types.h" // for intptr_t support +# include "MEM_guardedalloc.h" -# include "BLI_utildefines.h" /* for BLI_assert */ # include "BLI_math.h" +# include "BLI_utildefines.h" /* for BLI_assert */ # include "CCGSubSurf.h" # include "CCGSubSurf_intern.h" diff --git a/source/blender/blenkernel/intern/CCGSubSurf_util.c b/source/blender/blenkernel/intern/CCGSubSurf_util.c index ebd4531a67b..58d5f2e0495 100644 --- a/source/blender/blenkernel/intern/CCGSubSurf_util.c +++ b/source/blender/blenkernel/intern/CCGSubSurf_util.c @@ -18,12 +18,12 @@ * \ingroup bke */ +#include #include #include -#include -#include "MEM_guardedalloc.h" #include "BLI_sys_types.h" // for intptr_t support +#include "MEM_guardedalloc.h" #include "BLI_utildefines.h" /* for BLI_assert */ diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index f51c792f474..baef2b2290e 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -21,8 +21,8 @@ * \ingroup bke */ -#include #include +#include #include "MEM_guardedalloc.h" @@ -36,38 +36,38 @@ #include "DNA_scene_types.h" #include "BLI_array.h" -#include "BLI_blenlib.h" #include "BLI_bitmap.h" -#include "BLI_math.h" -#include "BLI_utildefines.h" +#include "BLI_blenlib.h" #include "BLI_linklist.h" +#include "BLI_math.h" #include "BLI_task.h" +#include "BLI_utildefines.h" #include "BKE_DerivedMesh.h" +#include "BKE_bvhutils.h" #include "BKE_colorband.h" +#include "BKE_deform.h" #include "BKE_editmesh.h" #include "BKE_key.h" #include "BKE_layer.h" #include "BKE_lib_id.h" #include "BKE_material.h" -#include "BKE_modifier.h" #include "BKE_mesh.h" #include "BKE_mesh_iterators.h" #include "BKE_mesh_mapping.h" #include "BKE_mesh_runtime.h" #include "BKE_mesh_tangent.h" +#include "BKE_modifier.h" +#include "BKE_multires.h" #include "BKE_object.h" #include "BKE_object_deform.h" #include "BKE_paint.h" -#include "BKE_multires.h" -#include "BKE_bvhutils.h" -#include "BKE_deform.h" #include "BLI_sys_types.h" /* for intptr_t support */ +#include "BKE_shrinkwrap.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" -#include "BKE_shrinkwrap.h" #include "CLG_log.h" diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c index d59505f1fa6..c332939e906 100644 --- a/source/blender/blenkernel/intern/action.c +++ b/source/blender/blenkernel/intern/action.c @@ -21,31 +21,31 @@ * \ingroup bke */ -#include #include -#include #include +#include +#include #include "MEM_guardedalloc.h" #include "DNA_anim_types.h" #include "DNA_armature_types.h" #include "DNA_constraint_types.h" -#include "DNA_scene_types.h" #include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BLI_blenlib.h" +#include "BLI_ghash.h" #include "BLI_math.h" #include "BLI_string_utils.h" #include "BLI_utildefines.h" -#include "BLI_ghash.h" #include "BLT_translation.h" #include "BKE_action.h" -#include "BKE_armature.h" #include "BKE_anim.h" #include "BKE_animsys.h" +#include "BKE_armature.h" #include "BKE_constraint.h" #include "BKE_deform.h" #include "BKE_fcurve.h" diff --git a/source/blender/blenkernel/intern/addon.c b/source/blender/blenkernel/intern/addon.c index 99ef38722f5..177c29cd935 100644 --- a/source/blender/blenkernel/intern/addon.c +++ b/source/blender/blenkernel/intern/addon.c @@ -23,10 +23,10 @@ #include "RNA_types.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" -#include "BLI_string.h" #include "BLI_listbase.h" +#include "BLI_string.h" +#include "BLI_utildefines.h" #include "BKE_addon.h" /* own include */ #include "BKE_idprop.h" diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c index 6b8f8e5303e..8804e7ae26c 100644 --- a/source/blender/blenkernel/intern/anim.c +++ b/source/blender/blenkernel/intern/anim.c @@ -25,9 +25,9 @@ #include +#include "BLI_dlrbTree.h" #include "BLI_listbase.h" #include "BLI_math.h" -#include "BLI_dlrbTree.h" #include "BLT_translation.h" @@ -36,20 +36,20 @@ #include "DNA_key_types.h" #include "DNA_scene_types.h" +#include "BKE_action.h" #include "BKE_anim.h" #include "BKE_animsys.h" -#include "BKE_action.h" #include "BKE_curve.h" #include "BKE_key.h" #include "BKE_main.h" #include "BKE_object.h" #include "BKE_particle.h" -#include "BKE_scene.h" #include "BKE_report.h" +#include "BKE_scene.h" #include "DEG_depsgraph.h" -#include "DEG_depsgraph_query.h" #include "DEG_depsgraph_build.h" +#include "DEG_depsgraph_query.h" #include "GPU_batch.h" diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c index ada104a7b5a..2027dbe6c23 100644 --- a/source/blender/blenkernel/intern/anim_sys.c +++ b/source/blender/blenkernel/intern/anim_sys.c @@ -21,22 +21,22 @@ * \ingroup bke */ -#include -#include -#include #include #include +#include +#include +#include #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" -#include "BLI_blenlib.h" #include "BLI_alloca.h" +#include "BLI_blenlib.h" #include "BLI_dynstr.h" #include "BLI_listbase.h" -#include "BLI_string_utils.h" #include "BLI_math_rotation.h" #include "BLI_math_vector.h" +#include "BLI_string_utils.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" diff --git a/source/blender/blenkernel/intern/appdir.c b/source/blender/blenkernel/intern/appdir.c index fbac9e6b773..0e578250b39 100644 --- a/source/blender/blenkernel/intern/appdir.c +++ b/source/blender/blenkernel/intern/appdir.c @@ -20,20 +20,20 @@ * Access to application level directories. */ +#include #include #include -#include -#include "BLI_utildefines.h" #include "BLI_fileops.h" #include "BLI_fileops_types.h" #include "BLI_listbase.h" #include "BLI_path_util.h" #include "BLI_string.h" #include "BLI_string_utf8.h" +#include "BLI_utildefines.h" -#include "BKE_blender_version.h" #include "BKE_appdir.h" /* own include */ +#include "BKE_blender_version.h" #include "GHOST_Path-api.h" @@ -49,9 +49,9 @@ # undef _WIN32_IE # endif # define _WIN32_IE 0x0501 -# include -# include # include "BLI_winstuff.h" +# include +# include #else /* non windows */ # ifdef WITH_BINRELOC # include "binreloc.h" diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c index c23cb9231d7..9c88ffb5d52 100644 --- a/source/blender/blenkernel/intern/armature.c +++ b/source/blender/blenkernel/intern/armature.c @@ -22,46 +22,46 @@ */ #include -#include +#include #include -#include #include -#include +#include +#include #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_alloca.h" +#include "BLI_ghash.h" #include "BLI_listbase.h" +#include "BLI_math.h" #include "BLI_string.h" -#include "BLI_ghash.h" #include "BLI_task.h" #include "BLI_utildefines.h" -#include "BLI_alloca.h" #include "BLT_translation.h" #include "DNA_anim_types.h" #include "DNA_armature_types.h" #include "DNA_constraint_types.h" #include "DNA_gpencil_types.h" -#include "DNA_mesh_types.h" #include "DNA_lattice_types.h" #include "DNA_listBase.h" +#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "DNA_scene_types.h" #include "DNA_object_types.h" +#include "DNA_scene_types.h" -#include "BKE_animsys.h" -#include "BKE_armature.h" #include "BKE_action.h" #include "BKE_anim.h" +#include "BKE_animsys.h" +#include "BKE_armature.h" #include "BKE_constraint.h" #include "BKE_curve.h" #include "BKE_deform.h" #include "BKE_displist.h" #include "BKE_idprop.h" #include "BKE_idtype.h" -#include "BKE_lib_id.h" #include "BKE_lattice.h" +#include "BKE_lib_id.h" #include "BKE_main.h" #include "BKE_object.h" #include "BKE_scene.h" diff --git a/source/blender/blenkernel/intern/armature_update.c b/source/blender/blenkernel/intern/armature_update.c index e30accf6279..e51b9ea85d1 100644 --- a/source/blender/blenkernel/intern/armature_update.c +++ b/source/blender/blenkernel/intern/armature_update.c @@ -25,9 +25,9 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_listbase.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "DNA_armature_types.h" #include "DNA_constraint_types.h" diff --git a/source/blender/blenkernel/intern/autoexec.c b/source/blender/blenkernel/intern/autoexec.c index 1616c46d05b..07b096af941 100644 --- a/source/blender/blenkernel/intern/autoexec.c +++ b/source/blender/blenkernel/intern/autoexec.c @@ -26,9 +26,9 @@ #include "DNA_userdef_types.h" -#include "BLI_utildefines.h" #include "BLI_fnmatch.h" #include "BLI_path_util.h" +#include "BLI_utildefines.h" #ifdef WIN32 # include "BLI_string.h" diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c index ac432bf0b64..70ab52828f2 100644 --- a/source/blender/blenkernel/intern/blender.c +++ b/source/blender/blenkernel/intern/blender.c @@ -23,23 +23,23 @@ * Application level startup/shutdown functionality. */ -#include #include +#include #include #include "MEM_guardedalloc.h" -#include "BLI_string.h" #include "BLI_listbase.h" +#include "BLI_string.h" #include "BLI_utildefines.h" #include "IMB_imbuf.h" #include "IMB_moviecache.h" #include "BKE_addon.h" -#include "BKE_blender.h" /* own include */ -#include "BKE_blender_version.h" /* own include */ +#include "BKE_blender.h" /* own include */ #include "BKE_blender_user_menu.h" +#include "BKE_blender_version.h" /* own include */ #include "BKE_blendfile.h" #include "BKE_brush.h" #include "BKE_cachefile.h" diff --git a/source/blender/blenkernel/intern/blender_copybuffer.c b/source/blender/blenkernel/intern/blender_copybuffer.c index 8619db34d93..4d27621a861 100644 --- a/source/blender/blenkernel/intern/blender_copybuffer.c +++ b/source/blender/blenkernel/intern/blender_copybuffer.c @@ -24,9 +24,9 @@ #include "MEM_guardedalloc.h" -#include "DNA_userdef_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" +#include "DNA_userdef_types.h" #include "DNA_view3d_types.h" #include "DNA_windowmanager_types.h" diff --git a/source/blender/blenkernel/intern/blender_undo.c b/source/blender/blenkernel/intern/blender_undo.c index bb705e2295c..99eb4dc9122 100644 --- a/source/blender/blenkernel/intern/blender_undo.c +++ b/source/blender/blenkernel/intern/blender_undo.c @@ -27,12 +27,12 @@ # include // for open close read #endif -#include -#include +#include +#include /* for open */ #include +#include +#include #include -#include /* for open */ -#include #include "MEM_guardedalloc.h" @@ -49,8 +49,8 @@ #include "BKE_global.h" #include "BKE_main.h" -#include "BLO_undofile.h" #include "BLO_readfile.h" +#include "BLO_undofile.h" #include "BLO_writefile.h" #include "DEG_depsgraph.h" diff --git a/source/blender/blenkernel/intern/blendfile.c b/source/blender/blenkernel/intern/blendfile.c index 3890bf4e7f8..6bf47a8c280 100644 --- a/source/blender/blenkernel/intern/blendfile.c +++ b/source/blender/blenkernel/intern/blendfile.c @@ -31,9 +31,9 @@ #include "DNA_workspace_types.h" #include "BLI_listbase.h" +#include "BLI_path_util.h" #include "BLI_string.h" #include "BLI_system.h" -#include "BLI_path_util.h" #include "BLI_utildefines.h" #include "IMB_colormanagement.h" diff --git a/source/blender/blenkernel/intern/boids.c b/source/blender/blenkernel/intern/boids.c index becef327fab..a493d5f49c8 100644 --- a/source/blender/blenkernel/intern/boids.c +++ b/source/blender/blenkernel/intern/boids.c @@ -21,23 +21,23 @@ * \ingroup bke */ -#include #include +#include #include "MEM_guardedalloc.h" #include "DNA_object_force_types.h" #include "DNA_scene_types.h" -#include "BLI_rand.h" -#include "BLI_math.h" #include "BLI_blenlib.h" #include "BLI_kdtree.h" +#include "BLI_math.h" +#include "BLI_rand.h" #include "BLI_utildefines.h" +#include "BKE_boids.h" #include "BKE_collision.h" #include "BKE_effect.h" -#include "BKE_boids.h" #include "BKE_particle.h" #include "BKE_modifier.h" diff --git a/source/blender/blenkernel/intern/bpath.c b/source/blender/blenkernel/intern/bpath.c index 7e3e629d328..5891a0361d8 100644 --- a/source/blender/blenkernel/intern/bpath.c +++ b/source/blender/blenkernel/intern/bpath.c @@ -27,53 +27,53 @@ #include -#include #include +#include /* path/file handling stuff */ #ifndef WIN32 # include # include #else -# include # include "BLI_winstuff.h" +# include #endif #include "MEM_guardedalloc.h" #include "DNA_brush_types.h" #include "DNA_cachefile_types.h" +#include "DNA_fluid_types.h" +#include "DNA_freestyle_types.h" #include "DNA_image_types.h" +#include "DNA_material_types.h" #include "DNA_mesh_types.h" #include "DNA_modifier_types.h" #include "DNA_movieclip_types.h" +#include "DNA_node_types.h" #include "DNA_object_fluidsim_types.h" #include "DNA_object_force_types.h" #include "DNA_object_types.h" #include "DNA_particle_types.h" +#include "DNA_scene_types.h" #include "DNA_sequence_types.h" #include "DNA_sound_types.h" #include "DNA_text_types.h" -#include "DNA_material_types.h" -#include "DNA_node_types.h" #include "DNA_texture_types.h" #include "DNA_vfont_types.h" -#include "DNA_scene_types.h" -#include "DNA_fluid_types.h" -#include "DNA_freestyle_types.h" #include "DNA_volume_types.h" #include "BLI_blenlib.h" #include "BLI_utildefines.h" #include "BKE_font.h" +#include "BKE_image.h" #include "BKE_lib_id.h" #include "BKE_library.h" #include "BKE_main.h" #include "BKE_node.h" #include "BKE_report.h" #include "BKE_sequencer.h" -#include "BKE_image.h" #include "BKE_bpath.h" /* own include */ diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c index 67e9feac0cf..e6045c45dc8 100644 --- a/source/blender/blenkernel/intern/brush.c +++ b/source/blender/blenkernel/intern/brush.c @@ -21,10 +21,10 @@ #include "MEM_guardedalloc.h" #include "DNA_brush_types.h" -#include "DNA_scene_types.h" -#include "DNA_object_types.h" -#include "DNA_gpencil_types.h" #include "DNA_defaults.h" +#include "DNA_gpencil_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BLI_listbase.h" #include "BLI_math.h" @@ -35,6 +35,7 @@ #include "BKE_brush.h" #include "BKE_colortools.h" #include "BKE_context.h" +#include "BKE_icons.h" #include "BKE_idtype.h" #include "BKE_lib_id.h" #include "BKE_lib_query.h" @@ -43,7 +44,6 @@ #include "BKE_material.h" #include "BKE_paint.h" #include "BKE_texture.h" -#include "BKE_icons.h" #include "IMB_colormanagement.h" #include "IMB_imbuf.h" diff --git a/source/blender/blenkernel/intern/bvhutils.c b/source/blender/blenkernel/intern/bvhutils.c index 78723455f14..8f6b8bd6980 100644 --- a/source/blender/blenkernel/intern/bvhutils.c +++ b/source/blender/blenkernel/intern/bvhutils.c @@ -21,18 +21,18 @@ * \ingroup bke */ +#include +#include #include #include -#include -#include #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "BLI_utildefines.h" #include "BLI_linklist.h" #include "BLI_math.h" #include "BLI_threads.h" +#include "BLI_utildefines.h" #include "BKE_bvhutils.h" #include "BKE_editmesh.h" diff --git a/source/blender/blenkernel/intern/cachefile.c b/source/blender/blenkernel/intern/cachefile.c index ef5b09213a6..605fba18d89 100644 --- a/source/blender/blenkernel/intern/cachefile.c +++ b/source/blender/blenkernel/intern/cachefile.c @@ -29,13 +29,13 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BLI_utildefines.h" #include "BLI_fileops.h" #include "BLI_ghash.h" #include "BLI_listbase.h" #include "BLI_path_util.h" #include "BLI_string.h" #include "BLI_threads.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" diff --git a/source/blender/blenkernel/intern/callbacks.c b/source/blender/blenkernel/intern/callbacks.c index 367fed818af..11ee9492b44 100644 --- a/source/blender/blenkernel/intern/callbacks.c +++ b/source/blender/blenkernel/intern/callbacks.c @@ -18,15 +18,15 @@ * \ingroup bke */ -#include "BLI_utildefines.h" #include "BLI_listbase.h" +#include "BLI_utildefines.h" #include "BKE_callbacks.h" #include "MEM_guardedalloc.h" -#include "RNA_types.h" #include "RNA_access.h" +#include "RNA_types.h" static ListBase callback_slots[BKE_CB_EVT_TOT] = {{NULL}}; diff --git a/source/blender/blenkernel/intern/camera.c b/source/blender/blenkernel/intern/camera.c index 1a2d8290609..30c2822e08b 100644 --- a/source/blender/blenkernel/intern/camera.c +++ b/source/blender/blenkernel/intern/camera.c @@ -21,19 +21,19 @@ * \ingroup bke */ -#include #include +#include +#include "DNA_ID.h" #include "DNA_camera_types.h" +#include "DNA_defaults.h" #include "DNA_light_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_view3d_types.h" -#include "DNA_ID.h" -#include "DNA_defaults.h" -#include "BLI_math.h" #include "BLI_listbase.h" +#include "BLI_math.h" #include "BLI_rect.h" #include "BLI_string.h" #include "BLI_utildefines.h" @@ -41,10 +41,10 @@ #include "BKE_animsys.h" #include "BKE_camera.h" #include "BKE_idtype.h" -#include "BKE_object.h" #include "BKE_layer.h" #include "BKE_lib_id.h" #include "BKE_main.h" +#include "BKE_object.h" #include "BKE_scene.h" #include "BKE_screen.h" diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index 8d79d106145..8a0df6375be 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -30,25 +30,25 @@ #include "BLI_utildefines.h" #include "BKE_DerivedMesh.h" -#include "BKE_pbvh.h" #include "BKE_cdderivedmesh.h" +#include "BKE_curve.h" +#include "BKE_editmesh.h" #include "BKE_mesh.h" #include "BKE_mesh_mapping.h" #include "BKE_object.h" #include "BKE_paint.h" -#include "BKE_editmesh.h" -#include "BKE_curve.h" +#include "BKE_pbvh.h" +#include "DNA_curve_types.h" /* for Curve */ #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" -#include "DNA_curve_types.h" /* for Curve */ #include "MEM_guardedalloc.h" -#include #include #include +#include typedef struct { DerivedMesh dm; diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c index cd849f89f53..0a35c9879b7 100644 --- a/source/blender/blenkernel/intern/cloth.c +++ b/source/blender/blenkernel/intern/cloth.c @@ -24,17 +24,17 @@ #include "MEM_guardedalloc.h" #include "DNA_cloth_types.h" -#include "DNA_scene_types.h" -#include "DNA_object_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" -#include "BLI_utildefines.h" -#include "BLI_math.h" -#include "BLI_rand.h" #include "BLI_edgehash.h" -#include "BLI_linklist.h" #include "BLI_ghash.h" +#include "BLI_linklist.h" +#include "BLI_math.h" +#include "BLI_rand.h" +#include "BLI_utildefines.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c index d9954323594..d39df4cc6a3 100644 --- a/source/blender/blenkernel/intern/collection.c +++ b/source/blender/blenkernel/intern/collection.c @@ -30,8 +30,8 @@ #include "BKE_collection.h" #include "BKE_icons.h" -#include "BKE_idtype.h" #include "BKE_idprop.h" +#include "BKE_idtype.h" #include "BKE_layer.h" #include "BKE_lib_id.h" #include "BKE_lib_remap.h" diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c index 62ad361570c..9230746cd1d 100644 --- a/source/blender/blenkernel/intern/collision.c +++ b/source/blender/blenkernel/intern/collision.c @@ -26,18 +26,18 @@ #include "DNA_cloth_types.h" #include "DNA_collection_types.h" #include "DNA_effect_types.h" -#include "DNA_object_types.h" +#include "DNA_meshdata_types.h" #include "DNA_object_force_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_meshdata_types.h" -#include "BLI_utildefines.h" #include "BLI_blenlib.h" +#include "BLI_ghash.h" #include "BLI_linklist.h" #include "BLI_math.h" #include "BLI_task.h" #include "BLI_threads.h" -#include "BLI_ghash.h" +#include "BLI_utildefines.h" #include "BKE_cloth.h" #include "BKE_collection.h" @@ -46,8 +46,8 @@ #include "BKE_modifier.h" #include "BKE_scene.h" -#include "BLI_kdopbvh.h" #include "BKE_collision.h" +#include "BLI_kdopbvh.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_physics.h" diff --git a/source/blender/blenkernel/intern/colorband.c b/source/blender/blenkernel/intern/colorband.c index dd45d42d230..499b0305c9d 100644 --- a/source/blender/blenkernel/intern/colorband.c +++ b/source/blender/blenkernel/intern/colorband.c @@ -23,17 +23,17 @@ #include "MEM_guardedalloc.h" +#include "BLI_heap.h" #include "BLI_math.h" -#include "BLI_utildefines.h" #include "BLI_math_color.h" -#include "BLI_heap.h" +#include "BLI_utildefines.h" #include "DNA_key_types.h" #include "DNA_texture_types.h" #include "BKE_colorband.h" -#include "BKE_material.h" #include "BKE_key.h" +#include "BKE_material.h" void BKE_colorband_init(ColorBand *coba, bool rangetype) { diff --git a/source/blender/blenkernel/intern/colortools.c b/source/blender/blenkernel/intern/colortools.c index e2080f04d3a..315035c1bc2 100644 --- a/source/blender/blenkernel/intern/colortools.c +++ b/source/blender/blenkernel/intern/colortools.c @@ -21,10 +21,10 @@ * \ingroup bke */ -#include +#include #include #include -#include +#include #include "MEM_guardedalloc.h" @@ -33,9 +33,9 @@ #include "BLI_blenlib.h" #include "BLI_math.h" -#include "BLI_utildefines.h" #include "BLI_task.h" #include "BLI_threads.h" +#include "BLI_utildefines.h" #include "BKE_colortools.h" #include "BKE_curve.h" diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index 3a86e3084d8..d131c1b4d18 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -21,35 +21,35 @@ * \ingroup bke */ -#include +#include +#include #include +#include #include -#include -#include #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_math.h" #include "BLI_kdopbvh.h" -#include "BLI_utildefines.h" +#include "BLI_math.h" #include "BLI_string_utils.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" +#include "DNA_action_types.h" #include "DNA_armature_types.h" #include "DNA_cachefile_types.h" #include "DNA_constraint_types.h" -#include "DNA_modifier_types.h" -#include "DNA_object_types.h" -#include "DNA_action_types.h" #include "DNA_curve_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" +#include "DNA_modifier_types.h" +#include "DNA_object_types.h" #include "DNA_lattice_types.h" +#include "DNA_movieclip_types.h" #include "DNA_scene_types.h" #include "DNA_tracking_types.h" -#include "DNA_movieclip_types.h" #include "BKE_action.h" #include "BKE_anim.h" /* for the curve calculation part */ diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c index b2c551a1752..f6db23111a1 100644 --- a/source/blender/blenkernel/intern/context.c +++ b/source/blender/blenkernel/intern/context.c @@ -18,21 +18,21 @@ * \ingroup bke */ -#include -#include #include +#include +#include #include "MEM_guardedalloc.h" #include "DNA_collection_types.h" +#include "DNA_gpencil_types.h" +#include "DNA_linestyle_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" #include "DNA_space_types.h" #include "DNA_view3d_types.h" #include "DNA_windowmanager_types.h" -#include "DNA_object_types.h" -#include "DNA_linestyle_types.h" -#include "DNA_gpencil_types.h" #include "DNA_workspace_types.h" #include "DEG_depsgraph.h" diff --git a/source/blender/blenkernel/intern/crazyspace.c b/source/blender/blenkernel/intern/crazyspace.c index ac62bd52011..7ec1da8eab4 100644 --- a/source/blender/blenkernel/intern/crazyspace.c +++ b/source/blender/blenkernel/intern/crazyspace.c @@ -23,23 +23,23 @@ #include "MEM_guardedalloc.h" -#include "DNA_scene_types.h" -#include "DNA_object_types.h" -#include "DNA_modifier_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" +#include "DNA_modifier_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" -#include "BLI_utildefines.h" #include "BLI_linklist.h" #include "BLI_math.h" +#include "BLI_utildefines.h" -#include "BKE_crazyspace.h" #include "BKE_DerivedMesh.h" -#include "BKE_modifier.h" -#include "BKE_multires.h" -#include "BKE_mesh.h" +#include "BKE_crazyspace.h" #include "BKE_editmesh.h" #include "BKE_lib_id.h" +#include "BKE_mesh.h" +#include "BKE_modifier.h" +#include "BKE_multires.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c index 13e6dc0fa40..ba1c75196db 100644 --- a/source/blender/blenkernel/intern/curve.c +++ b/source/blender/blenkernel/intern/curve.c @@ -22,29 +22,29 @@ */ #include // floor -#include #include +#include #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_math.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_linklist.h" +#include "BLI_math.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" #include "DNA_anim_types.h" #include "DNA_curve_types.h" -#include "DNA_material_types.h" #include "DNA_defaults.h" +#include "DNA_material_types.h" /* for dereferencing pointers */ #include "DNA_key_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_vfont_types.h" -#include "DNA_object_types.h" #include "BKE_animsys.h" #include "BKE_curve.h" @@ -54,8 +54,8 @@ #include "BKE_key.h" #include "BKE_lib_id.h" #include "BKE_main.h" -#include "BKE_object.h" #include "BKE_material.h" +#include "BKE_object.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/blenkernel/intern/curve_decimate.c b/source/blender/blenkernel/intern/curve_decimate.c index d569684d55c..68c0d2a3cec 100644 --- a/source/blender/blenkernel/intern/curve_decimate.c +++ b/source/blender/blenkernel/intern/curve_decimate.c @@ -20,9 +20,9 @@ #include "DNA_curve_types.h" -#include "MEM_guardedalloc.h" #include "BLI_heap.h" #include "BLI_math_vector.h" +#include "MEM_guardedalloc.h" #include "BKE_curve.h" diff --git a/source/blender/blenkernel/intern/curveprofile.c b/source/blender/blenkernel/intern/curveprofile.c index cd25d616454..0ab45921c56 100644 --- a/source/blender/blenkernel/intern/curveprofile.c +++ b/source/blender/blenkernel/intern/curveprofile.c @@ -21,24 +21,24 @@ * \ingroup bke */ -#include +#include #include #include -#include +#include #include "MEM_guardedalloc.h" -#include "DNA_curveprofile_types.h" #include "DNA_curve_types.h" +#include "DNA_curveprofile_types.h" #include "BLI_blenlib.h" #include "BLI_math.h" -#include "BLI_utildefines.h" #include "BLI_task.h" #include "BLI_threads.h" +#include "BLI_utildefines.h" -#include "BKE_curveprofile.h" #include "BKE_curve.h" +#include "BKE_curveprofile.h" #include "BKE_fcurve.h" void BKE_curveprofile_free_data(CurveProfile *profile) diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c index 117c96e2932..87a5ac80bc7 100644 --- a/source/blender/blenkernel/intern/customdata.c +++ b/source/blender/blenkernel/intern/customdata.c @@ -29,19 +29,19 @@ /* Since we have versioning code here (CustomData_verify_versions()). */ #define DNA_DEPRECATED_ALLOW +#include "DNA_ID.h" #include "DNA_customdata_types.h" #include "DNA_hair_types.h" #include "DNA_meshdata_types.h" #include "DNA_pointcloud_types.h" -#include "DNA_ID.h" -#include "BLI_utildefines.h" -#include "BLI_path_util.h" -#include "BLI_string.h" -#include "BLI_string_utils.h" #include "BLI_math.h" #include "BLI_math_color_blend.h" #include "BLI_mempool.h" +#include "BLI_path_util.h" +#include "BLI_string.h" +#include "BLI_string_utils.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" diff --git a/source/blender/blenkernel/intern/customdata_file.c b/source/blender/blenkernel/intern/customdata_file.c index 379da377b42..1463e50f6e3 100644 --- a/source/blender/blenkernel/intern/customdata_file.c +++ b/source/blender/blenkernel/intern/customdata_file.c @@ -24,10 +24,10 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" +#include "BLI_endian_switch.h" #include "BLI_fileops.h" #include "BLI_string.h" -#include "BLI_endian_switch.h" +#include "BLI_utildefines.h" #include "BKE_customdata_file.h" #include "BKE_global.h" diff --git a/source/blender/blenkernel/intern/data_transfer.c b/source/blender/blenkernel/intern/data_transfer.c index 9fd04108746..48e0ee50d43 100644 --- a/source/blender/blenkernel/intern/data_transfer.c +++ b/source/blender/blenkernel/intern/data_transfer.c @@ -27,13 +27,13 @@ #include "MEM_guardedalloc.h" #include "DNA_customdata_types.h" -#include "DNA_meshdata_types.h" #include "DNA_mesh_types.h" +#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_math.h" #include "BLI_utildefines.h" #include "BKE_customdata.h" @@ -41,8 +41,8 @@ #include "BKE_deform.h" #include "BKE_mesh.h" #include "BKE_mesh_mapping.h" -#include "BKE_mesh_runtime.h" #include "BKE_mesh_remap.h" +#include "BKE_mesh_runtime.h" #include "BKE_modifier.h" #include "BKE_object.h" #include "BKE_object_deform.h" diff --git a/source/blender/blenkernel/intern/deform.c b/source/blender/blenkernel/intern/deform.c index 7d9238fea7c..9a3965a86f6 100644 --- a/source/blender/blenkernel/intern/deform.c +++ b/source/blender/blenkernel/intern/deform.c @@ -21,16 +21,16 @@ * \ingroup bke */ -#include -#include #include -#include +#include #include +#include +#include #include "MEM_guardedalloc.h" -#include "DNA_meshdata_types.h" #include "DNA_mesh_types.h" +#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c index 6963f629798..dc2f603aa5c 100644 --- a/source/blender/blenkernel/intern/displist.c +++ b/source/blender/blenkernel/intern/displist.c @@ -29,8 +29,8 @@ #include "DNA_curve_types.h" #include "DNA_mesh_types.h" -#include "DNA_scene_types.h" #include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "DNA_vfont_types.h" #include "BLI_bitmap.h" @@ -42,18 +42,18 @@ #include "BLI_string.h" #include "BLI_utildefines.h" +#include "BKE_anim.h" +#include "BKE_curve.h" #include "BKE_displist.h" -#include "BKE_object.h" +#include "BKE_font.h" +#include "BKE_key.h" +#include "BKE_lattice.h" #include "BKE_lib_id.h" #include "BKE_mball.h" #include "BKE_mball_tessellate.h" #include "BKE_mesh.h" -#include "BKE_curve.h" -#include "BKE_key.h" -#include "BKE_anim.h" -#include "BKE_font.h" -#include "BKE_lattice.h" #include "BKE_modifier.h" +#include "BKE_object.h" #include "BLI_sys_types.h" // for intptr_t support diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index 7f71409a3f2..1054988f22f 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -24,8 +24,8 @@ #include #include "BLI_blenlib.h" -#include "BLI_math.h" #include "BLI_kdtree.h" +#include "BLI_math.h" #include "BLI_string_utils.h" #include "BLI_task.h" #include "BLI_threads.h" @@ -74,8 +74,8 @@ #include "DEG_depsgraph_query.h" /* for image output */ -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" /* to read material/texture color */ #include "RE_render_ext.h" diff --git a/source/blender/blenkernel/intern/editlattice.c b/source/blender/blenkernel/intern/editlattice.c index b002a87a3f5..d48eb698c36 100644 --- a/source/blender/blenkernel/intern/editlattice.c +++ b/source/blender/blenkernel/intern/editlattice.c @@ -20,15 +20,15 @@ #include "MEM_guardedalloc.h" -#include "DNA_listBase.h" -#include "DNA_object_types.h" +#include "DNA_curve_types.h" #include "DNA_key_types.h" #include "DNA_lattice_types.h" +#include "DNA_listBase.h" #include "DNA_meshdata_types.h" -#include "DNA_curve_types.h" +#include "DNA_object_types.h" -#include "BLI_math_vector.h" #include "BLI_listbase.h" +#include "BLI_math_vector.h" #include "BKE_deform.h" #include "BKE_key.h" diff --git a/source/blender/blenkernel/intern/editmesh.c b/source/blender/blenkernel/intern/editmesh.c index 5f727c2d01e..94976ed0c96 100644 --- a/source/blender/blenkernel/intern/editmesh.c +++ b/source/blender/blenkernel/intern/editmesh.c @@ -24,8 +24,8 @@ #include "MEM_guardedalloc.h" #include "DNA_listBase.h" -#include "DNA_object_types.h" #include "DNA_mesh_types.h" +#include "DNA_object_types.h" #include "BLI_bitmap.h" #include "BLI_math.h" diff --git a/source/blender/blenkernel/intern/editmesh_bvh.c b/source/blender/blenkernel/intern/editmesh_bvh.c index 5af4e4c0023..72793919570 100644 --- a/source/blender/blenkernel/intern/editmesh_bvh.c +++ b/source/blender/blenkernel/intern/editmesh_bvh.c @@ -23,8 +23,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_kdopbvh.h" +#include "BLI_math.h" #include "BKE_editmesh.h" diff --git a/source/blender/blenkernel/intern/editmesh_tangent.c b/source/blender/blenkernel/intern/editmesh_tangent.c index df2fb8c8348..e291a68a4b1 100644 --- a/source/blender/blenkernel/intern/editmesh_tangent.c +++ b/source/blender/blenkernel/intern/editmesh_tangent.c @@ -21,14 +21,14 @@ #include "BLI_math.h" #include "BLI_task.h" -#include "DNA_defs.h" #include "DNA_customdata_types.h" +#include "DNA_defs.h" #include "DNA_meshdata_types.h" -#include "BKE_mesh.h" -#include "BKE_mesh_tangent.h" /* for utility functions */ #include "BKE_editmesh.h" #include "BKE_editmesh_tangent.h" +#include "BKE_mesh.h" +#include "BKE_mesh_tangent.h" /* for utility functions */ #include "MEM_guardedalloc.h" diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c index 2cb91678893..f7ddc4385ac 100644 --- a/source/blender/blenkernel/intern/effect.c +++ b/source/blender/blenkernel/intern/effect.c @@ -21,8 +21,8 @@ * \ingroup bke */ -#include #include +#include #include #include @@ -34,18 +34,18 @@ #include "DNA_listBase.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "DNA_object_types.h" #include "DNA_object_force_types.h" +#include "DNA_object_types.h" #include "DNA_particle_types.h" -#include "DNA_texture_types.h" #include "DNA_scene_types.h" +#include "DNA_texture_types.h" -#include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_ghash.h" +#include "BLI_math.h" #include "BLI_noise.h" #include "BLI_rand.h" #include "BLI_utildefines.h" -#include "BLI_ghash.h" #include "PIL_time.h" @@ -56,13 +56,13 @@ #include "BKE_curve.h" #include "BKE_displist.h" #include "BKE_effect.h" +#include "BKE_fluid.h" #include "BKE_global.h" #include "BKE_layer.h" #include "BKE_modifier.h" #include "BKE_object.h" #include "BKE_particle.h" #include "BKE_scene.h" -#include "BKE_fluid.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_physics.h" diff --git a/source/blender/blenkernel/intern/fcurve.c b/source/blender/blenkernel/intern/fcurve.c index 7dfdc1e1008..4bd55c3c2ca 100644 --- a/source/blender/blenkernel/intern/fcurve.c +++ b/source/blender/blenkernel/intern/fcurve.c @@ -21,11 +21,11 @@ * \ingroup bke */ +#include #include -#include #include +#include #include -#include #include "MEM_guardedalloc.h" @@ -33,27 +33,27 @@ #include "DNA_constraint_types.h" #include "DNA_object_types.h" +#include "BLI_alloca.h" #include "BLI_blenlib.h" -#include "BLI_math.h" #include "BLI_easing.h" -#include "BLI_threads.h" +#include "BLI_expr_pylike_eval.h" +#include "BLI_math.h" #include "BLI_string_utils.h" +#include "BLI_threads.h" #include "BLI_utildefines.h" -#include "BLI_expr_pylike_eval.h" -#include "BLI_alloca.h" #include "BLT_translation.h" -#include "BKE_fcurve.h" -#include "BKE_animsys.h" #include "BKE_action.h" +#include "BKE_animsys.h" #include "BKE_armature.h" #include "BKE_constraint.h" #include "BKE_context.h" #include "BKE_curve.h" +#include "BKE_fcurve.h" #include "BKE_global.h" -#include "BKE_object.h" #include "BKE_nla.h" +#include "BKE_object.h" #include "RNA_access.h" diff --git a/source/blender/blenkernel/intern/fluid.c b/source/blender/blenkernel/intern/fluid.c index 54ddcac50c0..462447db7fa 100644 --- a/source/blender/blenkernel/intern/fluid.c +++ b/source/blender/blenkernel/intern/fluid.c @@ -59,8 +59,8 @@ # include "DNA_scene_types.h" # include "BLI_kdopbvh.h" -# include "BLI_threads.h" # include "BLI_kdtree.h" +# include "BLI_threads.h" # include "BLI_voxel.h" # include "BKE_bvhutils.h" diff --git a/source/blender/blenkernel/intern/fmodifier.c b/source/blender/blenkernel/intern/fmodifier.c index 10499ae0b5c..1d5a908e226 100644 --- a/source/blender/blenkernel/intern/fmodifier.c +++ b/source/blender/blenkernel/intern/fmodifier.c @@ -21,11 +21,11 @@ * \ingroup bke */ +#include #include -#include #include +#include #include -#include #include "MEM_guardedalloc.h" @@ -37,8 +37,8 @@ #include "BLI_blenlib.h" #include "BLI_ghash.h" -#include "BLI_noise.h" #include "BLI_math.h" /* windows needs for M_PI */ +#include "BLI_noise.h" #include "BLI_utildefines.h" #include "BKE_fcurve.h" diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c index ec6a265ed96..e25603e0af5 100644 --- a/source/blender/blenkernel/intern/font.c +++ b/source/blender/blenkernel/intern/font.c @@ -21,41 +21,41 @@ * \ingroup bke */ -#include -#include #include +#include #include +#include #include #include "CLG_log.h" #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" -#include "BLI_path_util.h" -#include "BLI_listbase.h" #include "BLI_ghash.h" +#include "BLI_listbase.h" +#include "BLI_math.h" +#include "BLI_path_util.h" #include "BLI_string.h" #include "BLI_string_utf8.h" -#include "BLI_math.h" #include "BLI_threads.h" +#include "BLI_utildefines.h" #include "BLI_vfontdata.h" #include "BLT_translation.h" -#include "DNA_packedFile_types.h" #include "DNA_curve_types.h" -#include "DNA_vfont_types.h" #include "DNA_object_types.h" +#include "DNA_packedFile_types.h" +#include "DNA_vfont_types.h" -#include "BKE_packedFile.h" -#include "BKE_lib_id.h" +#include "BKE_anim.h" +#include "BKE_curve.h" #include "BKE_font.h" #include "BKE_global.h" #include "BKE_idtype.h" +#include "BKE_lib_id.h" #include "BKE_main.h" -#include "BKE_anim.h" -#include "BKE_curve.h" +#include "BKE_packedFile.h" static CLG_LogRef LOG = {"bke.data_transfer"}; static ThreadRWMutex vfont_rwlock = BLI_RWLOCK_INITIALIZER; diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c index 0be92b7533d..7036da1f870 100644 --- a/source/blender/blenkernel/intern/gpencil.c +++ b/source/blender/blenkernel/intern/gpencil.c @@ -21,41 +21,41 @@ * \ingroup bke */ +#include +#include #include -#include #include -#include -#include +#include #include "CLG_log.h" #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_math_vector.h" #include "BLI_polyfill_2d.h" #include "BLI_string_utils.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "DNA_anim_types.h" -#include "DNA_meshdata_types.h" -#include "DNA_material_types.h" #include "DNA_gpencil_types.h" -#include "DNA_userdef_types.h" +#include "DNA_material_types.h" +#include "DNA_meshdata_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_space_types.h" -#include "DNA_object_types.h" +#include "DNA_userdef_types.h" #include "BKE_action.h" #include "BKE_animsys.h" -#include "BKE_curve.h" #include "BKE_collection.h" #include "BKE_colortools.h" +#include "BKE_curve.h" #include "BKE_deform.h" #include "BKE_gpencil.h" #include "BKE_icons.h" diff --git a/source/blender/blenkernel/intern/gpencil_modifier.c b/source/blender/blenkernel/intern/gpencil_modifier.c index 1014db27d84..e73070f117b 100644 --- a/source/blender/blenkernel/intern/gpencil_modifier.c +++ b/source/blender/blenkernel/intern/gpencil_modifier.c @@ -26,25 +26,25 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" -#include "BLI_math_vector.h" #include "BLI_math_geom.h" +#include "BLI_math_vector.h" #include "BLI_string_utils.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" +#include "DNA_gpencil_modifier_types.h" +#include "DNA_gpencil_types.h" #include "DNA_meshdata_types.h" -#include "DNA_scene_types.h" #include "DNA_object_types.h" -#include "DNA_gpencil_types.h" -#include "DNA_gpencil_modifier_types.h" +#include "DNA_scene_types.h" -#include "BKE_lib_id.h" -#include "BKE_lib_query.h" #include "BKE_gpencil.h" +#include "BKE_gpencil_modifier.h" #include "BKE_lattice.h" +#include "BKE_lib_id.h" +#include "BKE_lib_query.h" #include "BKE_material.h" -#include "BKE_gpencil_modifier.h" #include "BKE_object.h" #include "DEG_depsgraph.h" diff --git a/source/blender/blenkernel/intern/hair.c b/source/blender/blenkernel/intern/hair.c index 1553fb44108..5836bf16384 100644 --- a/source/blender/blenkernel/intern/hair.c +++ b/source/blender/blenkernel/intern/hair.c @@ -36,9 +36,9 @@ #include "BKE_animsys.h" #include "BKE_customdata.h" -#include "BKE_idtype.h" #include "BKE_global.h" #include "BKE_hair.h" +#include "BKE_idtype.h" #include "BKE_lib_id.h" #include "BKE_lib_query.h" #include "BKE_lib_remap.h" diff --git a/source/blender/blenkernel/intern/icons.c b/source/blender/blenkernel/intern/icons.c index 6363a23de6c..6da48195aab 100644 --- a/source/blender/blenkernel/intern/icons.c +++ b/source/blender/blenkernel/intern/icons.c @@ -40,15 +40,15 @@ #include "DNA_texture_types.h" #include "DNA_world_types.h" -#include "BLI_utildefines.h" +#include "BLI_fileops.h" #include "BLI_ghash.h" #include "BLI_linklist_lockfree.h" #include "BLI_string.h" -#include "BLI_fileops.h" #include "BLI_threads.h" +#include "BLI_utildefines.h" -#include "BKE_icons.h" #include "BKE_global.h" /* only for G.background test */ +#include "BKE_icons.h" #include "BKE_studiolight.h" #include "BLI_sys_types.h" // for intptr_t support diff --git a/source/blender/blenkernel/intern/icons_rasterize.c b/source/blender/blenkernel/intern/icons_rasterize.c index f731285e029..355a94c077b 100644 --- a/source/blender/blenkernel/intern/icons_rasterize.c +++ b/source/blender/blenkernel/intern/icons_rasterize.c @@ -19,9 +19,9 @@ */ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_bitmap_draw_2d.h" #include "BLI_math_geom.h" +#include "BLI_utildefines.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" diff --git a/source/blender/blenkernel/intern/idcode.c b/source/blender/blenkernel/intern/idcode.c index a6930a521af..454be246ad9 100644 --- a/source/blender/blenkernel/intern/idcode.c +++ b/source/blender/blenkernel/intern/idcode.c @@ -31,8 +31,8 @@ #include "BLT_translation.h" -#include "BKE_main.h" #include "BKE_idcode.h" +#include "BKE_main.h" typedef struct { unsigned short code; diff --git a/source/blender/blenkernel/intern/idprop.c b/source/blender/blenkernel/intern/idprop.c index 33d468dee0f..554b8d93db3 100644 --- a/source/blender/blenkernel/intern/idprop.c +++ b/source/blender/blenkernel/intern/idprop.c @@ -21,15 +21,15 @@ * \ingroup bke */ +#include #include #include -#include #include -#include "BLI_utildefines.h" -#include "BLI_string.h" #include "BLI_listbase.h" #include "BLI_math.h" +#include "BLI_string.h" +#include "BLI_utildefines.h" #include "BKE_idprop.h" #include "BKE_lib_id.h" diff --git a/source/blender/blenkernel/intern/idprop_utils.c b/source/blender/blenkernel/intern/idprop_utils.c index 312957c96ce..c966838171d 100644 --- a/source/blender/blenkernel/intern/idprop_utils.c +++ b/source/blender/blenkernel/intern/idprop_utils.c @@ -21,12 +21,12 @@ #include #include -#include "BLI_utildefines.h" -#include "BLI_string.h" #include "BLI_dynstr.h" +#include "BLI_string.h" +#include "BLI_utildefines.h" -#include "BKE_idprop.h" #include "BKE_idcode.h" +#include "BKE_idprop.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index 22ec1fe1b98..953b738213a 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -21,10 +21,10 @@ * \ingroup bke */ -#include -#include #include #include +#include +#include #ifndef WIN32 # include #else @@ -38,26 +38,26 @@ #include "MEM_guardedalloc.h" #include "IMB_colormanagement.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" -#include "IMB_moviecache.h" +#include "IMB_imbuf_types.h" #include "IMB_metadata.h" +#include "IMB_moviecache.h" #ifdef WITH_OPENEXR # include "intern/openexr/openexr_multi.h" #endif -#include "DNA_packedFile_types.h" -#include "DNA_scene_types.h" -#include "DNA_object_types.h" -#include "DNA_camera_types.h" -#include "DNA_sequence_types.h" #include "DNA_brush_types.h" +#include "DNA_camera_types.h" +#include "DNA_defaults.h" +#include "DNA_light_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "DNA_light_types.h" +#include "DNA_object_types.h" +#include "DNA_packedFile_types.h" +#include "DNA_scene_types.h" +#include "DNA_sequence_types.h" #include "DNA_world_types.h" -#include "DNA_defaults.h" #include "BLI_blenlib.h" #include "BLI_math_vector.h" @@ -76,10 +76,10 @@ #include "BKE_image.h" #include "BKE_lib_id.h" #include "BKE_main.h" +#include "BKE_node.h" #include "BKE_packedFile.h" #include "BKE_report.h" #include "BKE_scene.h" -#include "BKE_node.h" #include "BKE_sequencer.h" /* seq_foreground_frame_get() */ #include "BKE_workspace.h" @@ -99,8 +99,8 @@ /* for image user iteration */ #include "DNA_node_types.h" -#include "DNA_space_types.h" #include "DNA_screen_types.h" +#include "DNA_space_types.h" #include "DNA_view3d_types.h" static CLG_LogRef LOG = {"bke.image"}; diff --git a/source/blender/blenkernel/intern/ipo.c b/source/blender/blenkernel/intern/ipo.c index 57bd2539003..269235176cd 100644 --- a/source/blender/blenkernel/intern/ipo.c +++ b/source/blender/blenkernel/intern/ipo.c @@ -30,25 +30,25 @@ */ #include +#include #include #include -#include /* since we have versioning code here */ #define DNA_DEPRECATED_ALLOW #include "DNA_anim_types.h" -#include "DNA_constraint_types.h" #include "DNA_camera_types.h" -#include "DNA_light_types.h" +#include "DNA_constraint_types.h" #include "DNA_ipo_types.h" #include "DNA_key_types.h" +#include "DNA_light_types.h" #include "DNA_material_types.h" #include "DNA_nla_types.h" -#include "DNA_sequence_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" +#include "DNA_sequence_types.h" #include "DNA_world_types.h" -#include "DNA_object_types.h" #include "BLI_blenlib.h" #include "BLI_dynstr.h" @@ -57,12 +57,12 @@ #include "BLT_translation.h" -#include "BKE_ipo.h" -#include "BKE_animsys.h" #include "BKE_action.h" +#include "BKE_animsys.h" #include "BKE_fcurve.h" #include "BKE_global.h" #include "BKE_idtype.h" +#include "BKE_ipo.h" #include "BKE_key.h" #include "BKE_lib_id.h" #include "BKE_main.h" diff --git a/source/blender/blenkernel/intern/key.c b/source/blender/blenkernel/intern/key.c index 59ecf8178f0..a6708413f70 100644 --- a/source/blender/blenkernel/intern/key.c +++ b/source/blender/blenkernel/intern/key.c @@ -22,8 +22,8 @@ */ #include -#include #include +#include #include "MEM_guardedalloc.h" @@ -34,8 +34,8 @@ #include "BLT_translation.h" -#include "DNA_anim_types.h" #include "DNA_ID.h" +#include "DNA_anim_types.h" #include "DNA_key_types.h" #include "DNA_lattice_types.h" #include "DNA_mesh_types.h" @@ -47,13 +47,13 @@ #include "BKE_curve.h" #include "BKE_customdata.h" #include "BKE_deform.h" +#include "BKE_editmesh.h" #include "BKE_idtype.h" #include "BKE_key.h" #include "BKE_lattice.h" #include "BKE_lib_id.h" #include "BKE_main.h" #include "BKE_mesh.h" -#include "BKE_editmesh.h" #include "BKE_scene.h" #include "RNA_access.h" diff --git a/source/blender/blenkernel/intern/keyconfig.c b/source/blender/blenkernel/intern/keyconfig.c index 5e68d093d52..84f48441cf9 100644 --- a/source/blender/blenkernel/intern/keyconfig.c +++ b/source/blender/blenkernel/intern/keyconfig.c @@ -23,17 +23,17 @@ #include "RNA_types.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_listbase.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "DNA_listBase.h" #include "DNA_userdef_types.h" #include "DNA_windowmanager_types.h" -#include "BKE_keyconfig.h" /* own include */ #include "BKE_idprop.h" +#include "BKE_keyconfig.h" /* own include */ #include "MEM_guardedalloc.h" diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c index 02bf4dfac8e..3f353d6d576 100644 --- a/source/blender/blenkernel/intern/lattice.c +++ b/source/blender/blenkernel/intern/lattice.c @@ -21,32 +21,32 @@ * \ingroup bke */ -#include -#include #include +#include #include +#include #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" -#include "BLI_listbase.h" #include "BLI_bitmap.h" +#include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_task.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" +#include "DNA_curve_types.h" +#include "DNA_defaults.h" +#include "DNA_key_types.h" +#include "DNA_lattice_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "DNA_scene_types.h" #include "DNA_object_types.h" -#include "DNA_lattice_types.h" -#include "DNA_curve_types.h" -#include "DNA_key_types.h" -#include "DNA_defaults.h" +#include "DNA_scene_types.h" -#include "BKE_animsys.h" #include "BKE_anim.h" +#include "BKE_animsys.h" #include "BKE_curve.h" #include "BKE_displist.h" #include "BKE_idtype.h" diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c index f9f15918d67..8b3a46a3eb5 100644 --- a/source/blender/blenkernel/intern/layer.c +++ b/source/blender/blenkernel/intern/layer.c @@ -38,12 +38,12 @@ #include "BKE_object.h" #include "DNA_ID.h" -#include "DNA_space_types.h" #include "DNA_collection_types.h" #include "DNA_layer_types.h" -#include "DNA_object_types.h" #include "DNA_node_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" +#include "DNA_space_types.h" #include "DNA_view3d_types.h" #include "DNA_windowmanager_types.h" #include "DNA_workspace_types.h" diff --git a/source/blender/blenkernel/intern/layer_utils.c b/source/blender/blenkernel/intern/layer_utils.c index 716fe63dc29..d77c214130a 100644 --- a/source/blender/blenkernel/intern/layer_utils.c +++ b/source/blender/blenkernel/intern/layer_utils.c @@ -28,8 +28,8 @@ #include "DNA_ID.h" #include "DNA_layer_types.h" -#include "DNA_object_types.h" #include "DNA_mesh_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/blenkernel/intern/lib_id.c b/source/blender/blenkernel/intern/lib_id.c index 9c4bef04adf..3e779c92a4a 100644 --- a/source/blender/blenkernel/intern/lib_id.c +++ b/source/blender/blenkernel/intern/lib_id.c @@ -24,12 +24,12 @@ * allocate and free of all library data */ -#include +#include #include -#include -#include #include -#include +#include +#include +#include #include "CLG_log.h" @@ -46,28 +46,28 @@ #include "DNA_hair_types.h" #include "DNA_ipo_types.h" #include "DNA_key_types.h" -#include "DNA_light_types.h" #include "DNA_lattice_types.h" +#include "DNA_light_types.h" +#include "DNA_lightprobe_types.h" #include "DNA_linestyle_types.h" +#include "DNA_mask_types.h" #include "DNA_material_types.h" #include "DNA_mesh_types.h" #include "DNA_meta_types.h" #include "DNA_movieclip_types.h" -#include "DNA_mask_types.h" #include "DNA_node_types.h" #include "DNA_object_types.h" #include "DNA_pointcloud_types.h" -#include "DNA_lightprobe_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" -#include "DNA_speaker_types.h" #include "DNA_sound_types.h" +#include "DNA_speaker_types.h" #include "DNA_text_types.h" #include "DNA_vfont_types.h" #include "DNA_volume_types.h" #include "DNA_windowmanager_types.h" -#include "DNA_world_types.h" #include "DNA_workspace_types.h" +#include "DNA_world_types.h" #include "BLI_utildefines.h" @@ -84,8 +84,8 @@ #include "BKE_armature.h" #include "BKE_bpath.h" #include "BKE_brush.h" -#include "BKE_camera.h" #include "BKE_cachefile.h" +#include "BKE_camera.h" #include "BKE_collection.h" #include "BKE_context.h" #include "BKE_curve.h" @@ -98,28 +98,28 @@ #include "BKE_idtype.h" #include "BKE_image.h" #include "BKE_key.h" -#include "BKE_light.h" #include "BKE_lattice.h" #include "BKE_lib_id.h" #include "BKE_lib_query.h" #include "BKE_lib_remap.h" +#include "BKE_light.h" +#include "BKE_lightprobe.h" #include "BKE_linestyle.h" -#include "BKE_mesh.h" -#include "BKE_material.h" #include "BKE_main.h" -#include "BKE_mball.h" #include "BKE_mask.h" +#include "BKE_material.h" +#include "BKE_mball.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_pointcloud.h" -#include "BKE_lightprobe.h" #include "BKE_rigidbody.h" +#include "BKE_scene.h" #include "BKE_sound.h" #include "BKE_speaker.h" -#include "BKE_scene.h" #include "BKE_text.h" #include "BKE_texture.h" #include "BKE_volume.h" diff --git a/source/blender/blenkernel/intern/lib_id_delete.c b/source/blender/blenkernel/intern/lib_id_delete.c index 824d1600ecc..e1f4f36b822 100644 --- a/source/blender/blenkernel/intern/lib_id_delete.c +++ b/source/blender/blenkernel/intern/lib_id_delete.c @@ -25,27 +25,27 @@ /* all types are needed here, in order to do memory operations */ #include "DNA_armature_types.h" #include "DNA_brush_types.h" -#include "DNA_camera_types.h" #include "DNA_cachefile_types.h" +#include "DNA_camera_types.h" #include "DNA_collection_types.h" #include "DNA_gpencil_types.h" #include "DNA_ipo_types.h" #include "DNA_key_types.h" -#include "DNA_light_types.h" #include "DNA_lattice_types.h" +#include "DNA_light_types.h" +#include "DNA_lightprobe_types.h" #include "DNA_linestyle_types.h" +#include "DNA_mask_types.h" #include "DNA_material_types.h" #include "DNA_mesh_types.h" #include "DNA_meta_types.h" #include "DNA_movieclip_types.h" -#include "DNA_mask_types.h" #include "DNA_node_types.h" #include "DNA_object_types.h" -#include "DNA_lightprobe_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" -#include "DNA_speaker_types.h" #include "DNA_sound_types.h" +#include "DNA_speaker_types.h" #include "DNA_text_types.h" #include "DNA_vfont_types.h" #include "DNA_windowmanager_types.h" @@ -60,8 +60,8 @@ #include "BKE_animsys.h" #include "BKE_armature.h" #include "BKE_brush.h" -#include "BKE_camera.h" #include "BKE_cachefile.h" +#include "BKE_camera.h" #include "BKE_collection.h" #include "BKE_curve.h" #include "BKE_font.h" @@ -71,28 +71,28 @@ #include "BKE_image.h" #include "BKE_ipo.h" #include "BKE_key.h" -#include "BKE_light.h" #include "BKE_lattice.h" #include "BKE_lib_id.h" #include "BKE_lib_override.h" #include "BKE_lib_remap.h" #include "BKE_library.h" +#include "BKE_light.h" +#include "BKE_lightprobe.h" #include "BKE_linestyle.h" -#include "BKE_mesh.h" -#include "BKE_material.h" #include "BKE_main.h" #include "BKE_mask.h" +#include "BKE_material.h" #include "BKE_mball.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_lightprobe.h" -#include "BKE_speaker.h" -#include "BKE_sound.h" -#include "BKE_screen.h" #include "BKE_scene.h" +#include "BKE_screen.h" +#include "BKE_sound.h" +#include "BKE_speaker.h" #include "BKE_text.h" #include "BKE_texture.h" #include "BKE_workspace.h" diff --git a/source/blender/blenkernel/intern/lib_override.c b/source/blender/blenkernel/intern/lib_override.c index 81f7e158b40..42d1806a41a 100644 --- a/source/blender/blenkernel/intern/lib_override.c +++ b/source/blender/blenkernel/intern/lib_override.c @@ -37,10 +37,10 @@ #include "BKE_lib_remap.h" #include "BKE_main.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_listbase.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "RNA_access.h" #include "RNA_types.h" diff --git a/source/blender/blenkernel/intern/lib_query.c b/source/blender/blenkernel/intern/lib_query.c index 67065a1d715..886fb4241a4 100644 --- a/source/blender/blenkernel/intern/lib_query.c +++ b/source/blender/blenkernel/intern/lib_query.c @@ -32,26 +32,26 @@ #include "DNA_gpencil_types.h" #include "DNA_hair_types.h" #include "DNA_key_types.h" -#include "DNA_light_types.h" #include "DNA_lattice_types.h" +#include "DNA_light_types.h" +#include "DNA_lightprobe_types.h" #include "DNA_linestyle_types.h" +#include "DNA_mask_types.h" #include "DNA_material_types.h" #include "DNA_mesh_types.h" #include "DNA_meta_types.h" #include "DNA_movieclip_types.h" -#include "DNA_mask_types.h" #include "DNA_node_types.h" #include "DNA_object_force_types.h" #include "DNA_outliner_types.h" -#include "DNA_lightprobe_types.h" #include "DNA_pointcloud_types.h" #include "DNA_rigidbody_types.h" #include "DNA_scene_types.h" -#include "DNA_sequence_types.h" #include "DNA_screen_types.h" +#include "DNA_sequence_types.h" +#include "DNA_sound_types.h" #include "DNA_space_types.h" #include "DNA_speaker_types.h" -#include "DNA_sound_types.h" #include "DNA_text_types.h" #include "DNA_vfont_types.h" #include "DNA_volume_types.h" @@ -59,9 +59,9 @@ #include "DNA_workspace_types.h" #include "DNA_world_types.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_linklist_stack.h" +#include "BLI_utildefines.h" #include "BKE_animsys.h" #include "BKE_collection.h" diff --git a/source/blender/blenkernel/intern/lib_remap.c b/source/blender/blenkernel/intern/lib_remap.c index 578d4be44d3..72ae4629dba 100644 --- a/source/blender/blenkernel/intern/lib_remap.c +++ b/source/blender/blenkernel/intern/lib_remap.c @@ -33,8 +33,8 @@ #include "BKE_lib_id.h" #include "BKE_lib_query.h" #include "BKE_lib_remap.h" -#include "BKE_material.h" #include "BKE_main.h" +#include "BKE_material.h" #include "BKE_mball.h" #include "BKE_modifier.h" #include "BKE_multires.h" diff --git a/source/blender/blenkernel/intern/light.c b/source/blender/blenkernel/intern/light.c index 5f14352a1b0..aec0f808f64 100644 --- a/source/blender/blenkernel/intern/light.c +++ b/source/blender/blenkernel/intern/light.c @@ -26,13 +26,13 @@ #include "MEM_guardedalloc.h" #include "DNA_anim_types.h" +#include "DNA_defaults.h" #include "DNA_light_types.h" #include "DNA_material_types.h" #include "DNA_node_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_texture_types.h" -#include "DNA_defaults.h" #include "BLI_math.h" #include "BLI_utildefines.h" @@ -41,8 +41,8 @@ #include "BKE_colortools.h" #include "BKE_icons.h" #include "BKE_idtype.h" -#include "BKE_light.h" #include "BKE_lib_id.h" +#include "BKE_light.h" #include "BKE_main.h" #include "BKE_node.h" diff --git a/source/blender/blenkernel/intern/lightprobe.c b/source/blender/blenkernel/intern/lightprobe.c index 5848444a0d7..4675897cb0e 100644 --- a/source/blender/blenkernel/intern/lightprobe.c +++ b/source/blender/blenkernel/intern/lightprobe.c @@ -23,9 +23,9 @@ #include -#include "DNA_object_types.h" -#include "DNA_lightprobe_types.h" #include "DNA_defaults.h" +#include "DNA_lightprobe_types.h" +#include "DNA_object_types.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/linestyle.c b/source/blender/blenkernel/intern/linestyle.c index c5767e8bbcc..db39931a9d2 100644 --- a/source/blender/blenkernel/intern/linestyle.c +++ b/source/blender/blenkernel/intern/linestyle.c @@ -27,10 +27,10 @@ #include "MEM_guardedalloc.h" -#include "DNA_object_types.h" +#include "DNA_defaults.h" #include "DNA_material_types.h" /* for ramp blend */ +#include "DNA_object_types.h" #include "DNA_texture_types.h" -#include "DNA_defaults.h" #include "BLI_blenlib.h" #include "BLI_math.h" @@ -39,7 +39,9 @@ #include "BLT_translation.h" +#include "BKE_animsys.h" #include "BKE_colorband.h" +#include "BKE_colortools.h" #include "BKE_context.h" #include "BKE_freestyle.h" #include "BKE_idtype.h" @@ -47,8 +49,6 @@ #include "BKE_linestyle.h" #include "BKE_main.h" #include "BKE_node.h" -#include "BKE_colortools.h" -#include "BKE_animsys.h" static void linestyle_init_data(ID *id) { diff --git a/source/blender/blenkernel/intern/main_idmap.c b/source/blender/blenkernel/intern/main_idmap.c index 8b83482d685..0936e1f399f 100644 --- a/source/blender/blenkernel/intern/main_idmap.c +++ b/source/blender/blenkernel/intern/main_idmap.c @@ -14,14 +14,14 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include #include +#include #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_listbase.h" +#include "BLI_utildefines.h" #include "DNA_ID.h" diff --git a/source/blender/blenkernel/intern/mask.c b/source/blender/blenkernel/intern/mask.c index 5a212bfef37..aafbcf0d360 100644 --- a/source/blender/blenkernel/intern/mask.c +++ b/source/blender/blenkernel/intern/mask.c @@ -28,33 +28,33 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" -#include "BLI_string.h" -#include "BLI_string_utils.h" #include "BLI_listbase.h" #include "BLI_math.h" +#include "BLI_string.h" +#include "BLI_string_utils.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" #include "DNA_mask_types.h" #include "DNA_node_types.h" #include "DNA_screen_types.h" -#include "DNA_space_types.h" #include "DNA_sequence_types.h" +#include "DNA_space_types.h" #include "BKE_animsys.h" #include "BKE_curve.h" #include "BKE_idtype.h" +#include "BKE_image.h" #include "BKE_lib_id.h" #include "BKE_main.h" #include "BKE_mask.h" +#include "BKE_movieclip.h" #include "BKE_node.h" #include "BKE_sequencer.h" #include "BKE_tracking.h" -#include "BKE_movieclip.h" -#include "BKE_image.h" #include "DEG_depsgraph_build.h" diff --git a/source/blender/blenkernel/intern/mask_evaluate.c b/source/blender/blenkernel/intern/mask_evaluate.c index cb8b3b5ecc9..9b281103a0f 100644 --- a/source/blender/blenkernel/intern/mask_evaluate.c +++ b/source/blender/blenkernel/intern/mask_evaluate.c @@ -28,8 +28,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "DNA_mask_types.h" #include "DNA_object_types.h" diff --git a/source/blender/blenkernel/intern/mask_rasterize.c b/source/blender/blenkernel/intern/mask_rasterize.c index e6cfea6fb03..412ccd3ab39 100644 --- a/source/blender/blenkernel/intern/mask_rasterize.c +++ b/source/blender/blenkernel/intern/mask_rasterize.c @@ -69,19 +69,19 @@ #include "MEM_guardedalloc.h" -#include "DNA_vec_types.h" #include "DNA_mask_types.h" #include "DNA_scene_types.h" +#include "DNA_vec_types.h" -#include "BLI_utildefines.h" -#include "BLI_scanfill.h" #include "BLI_memarena.h" +#include "BLI_scanfill.h" +#include "BLI_utildefines.h" +#include "BLI_linklist.h" +#include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_rect.h" #include "BLI_task.h" -#include "BLI_listbase.h" -#include "BLI_linklist.h" #include "BKE_mask.h" diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index 15f18eef7c8..31fe93f64ed 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -21,42 +21,45 @@ * \ingroup bke */ -#include #include #include +#include #include "CLG_log.h" #include "MEM_guardedalloc.h" +#include "DNA_ID.h" #include "DNA_anim_types.h" #include "DNA_collection_types.h" #include "DNA_curve_types.h" -#include "DNA_material_types.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_customdata_types.h" +#include "DNA_defaults.h" #include "DNA_gpencil_types.h" #include "DNA_hair_types.h" -#include "DNA_ID.h" +#include "DNA_material_types.h" +#include "DNA_mesh_types.h" +#include "DNA_meshdata_types.h" #include "DNA_meta_types.h" #include "DNA_node_types.h" #include "DNA_object_types.h" #include "DNA_pointcloud_types.h" #include "DNA_scene_types.h" #include "DNA_volume_types.h" -#include "DNA_defaults.h" -#include "BLI_math.h" +#include "BLI_array_utils.h" #include "BLI_listbase.h" +#include "BLI_math.h" #include "BLI_utildefines.h" -#include "BLI_array_utils.h" #include "BLT_translation.h" #include "BKE_animsys.h" #include "BKE_brush.h" +#include "BKE_curve.h" #include "BKE_displist.h" +#include "BKE_editmesh.h" +#include "BKE_font.h" #include "BKE_gpencil.h" #include "BKE_icons.h" #include "BKE_idtype.h" @@ -65,11 +68,8 @@ #include "BKE_main.h" #include "BKE_material.h" #include "BKE_mesh.h" -#include "BKE_scene.h" #include "BKE_node.h" -#include "BKE_curve.h" -#include "BKE_editmesh.h" -#include "BKE_font.h" +#include "BKE_scene.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c index 624911a9792..b708c030152 100644 --- a/source/blender/blenkernel/intern/mball.c +++ b/source/blender/blenkernel/intern/mball.c @@ -26,20 +26,20 @@ * \ingroup bke */ -#include -#include -#include -#include #include #include +#include +#include +#include +#include #include "MEM_guardedalloc.h" +#include "DNA_defaults.h" #include "DNA_material_types.h" -#include "DNA_object_types.h" #include "DNA_meta_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_defaults.h" #include "BLI_blenlib.h" #include "BLI_math.h" @@ -52,13 +52,13 @@ #include "BKE_animsys.h" #include "BKE_curve.h" +#include "BKE_displist.h" #include "BKE_idtype.h" -#include "BKE_scene.h" #include "BKE_lib_id.h" -#include "BKE_displist.h" +#include "BKE_material.h" #include "BKE_mball.h" #include "BKE_object.h" -#include "BKE_material.h" +#include "BKE_scene.h" #include "DEG_depsgraph.h" diff --git a/source/blender/blenkernel/intern/mball_tessellate.c b/source/blender/blenkernel/intern/mball_tessellate.c index ca1ca2618d8..cd629c888a4 100644 --- a/source/blender/blenkernel/intern/mball_tessellate.c +++ b/source/blender/blenkernel/intern/mball_tessellate.c @@ -21,24 +21,24 @@ * \ingroup bke */ -#include -#include -#include -#include #include #include +#include +#include +#include +#include #include "MEM_guardedalloc.h" -#include "DNA_object_types.h" #include "DNA_meta_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" #include "BLI_listbase.h" #include "BLI_math.h" +#include "BLI_memarena.h" #include "BLI_string_utils.h" #include "BLI_utildefines.h" -#include "BLI_memarena.h" #include "BKE_global.h" diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index 3a9a38288a7..68d10bd02a8 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -23,38 +23,38 @@ #include "MEM_guardedalloc.h" -#include "DNA_object_types.h" +#include "DNA_defaults.h" #include "DNA_key_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "DNA_defaults.h" +#include "DNA_object_types.h" -#include "BLI_utildefines.h" #include "BLI_bitmap.h" +#include "BLI_edgehash.h" #include "BLI_ghash.h" #include "BLI_hash.h" -#include "BLI_math.h" #include "BLI_linklist.h" +#include "BLI_math.h" #include "BLI_memarena.h" -#include "BLI_edgehash.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" #include "BKE_animsys.h" -#include "BKE_idcode.h" -#include "BKE_main.h" +#include "BKE_editmesh.h" #include "BKE_global.h" +#include "BKE_idcode.h" #include "BKE_idtype.h" #include "BKE_key.h" -#include "BKE_mesh.h" -#include "BKE_mesh_runtime.h" #include "BKE_lib_id.h" +#include "BKE_main.h" #include "BKE_material.h" +#include "BKE_mesh.h" +#include "BKE_mesh_runtime.h" #include "BKE_modifier.h" #include "BKE_multires.h" #include "BKE_object.h" -#include "BKE_editmesh.h" #include "PIL_time.h" diff --git a/source/blender/blenkernel/intern/mesh_convert.c b/source/blender/blenkernel/intern/mesh_convert.c index ce8fcc4eeb9..955f1aca110 100644 --- a/source/blender/blenkernel/intern/mesh_convert.c +++ b/source/blender/blenkernel/intern/mesh_convert.c @@ -22,32 +22,32 @@ #include "MEM_guardedalloc.h" -#include "DNA_scene_types.h" +#include "DNA_curve_types.h" #include "DNA_key_types.h" #include "DNA_material_types.h" +#include "DNA_mesh_types.h" #include "DNA_meta_types.h" #include "DNA_object_types.h" -#include "DNA_mesh_types.h" -#include "DNA_curve_types.h" +#include "DNA_scene_types.h" -#include "BLI_utildefines.h" -#include "BLI_math.h" -#include "BLI_listbase.h" #include "BLI_edgehash.h" +#include "BLI_listbase.h" +#include "BLI_math.h" #include "BLI_string.h" +#include "BLI_utildefines.h" -#include "BKE_main.h" #include "BKE_DerivedMesh.h" +#include "BKE_displist.h" #include "BKE_editmesh.h" #include "BKE_key.h" +#include "BKE_lib_id.h" #include "BKE_lib_query.h" +#include "BKE_main.h" +#include "BKE_material.h" +#include "BKE_mball.h" #include "BKE_mesh.h" #include "BKE_mesh_runtime.h" #include "BKE_modifier.h" -#include "BKE_displist.h" -#include "BKE_lib_id.h" -#include "BKE_material.h" -#include "BKE_mball.h" /* these 2 are only used by conversion functions */ #include "BKE_curve.h" /* -- */ diff --git a/source/blender/blenkernel/intern/mesh_evaluate.c b/source/blender/blenkernel/intern/mesh_evaluate.c index e14803e4193..ac5a68b7764 100644 --- a/source/blender/blenkernel/intern/mesh_evaluate.c +++ b/source/blender/blenkernel/intern/mesh_evaluate.c @@ -29,21 +29,21 @@ #include "MEM_guardedalloc.h" -#include "DNA_object_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" +#include "DNA_object_types.h" -#include "BLI_utildefines.h" -#include "BLI_memarena.h" -#include "BLI_math.h" -#include "BLI_edgehash.h" +#include "BLI_alloca.h" #include "BLI_bitmap.h" -#include "BLI_polyfill_2d.h" +#include "BLI_edgehash.h" #include "BLI_linklist.h" #include "BLI_linklist_stack.h" -#include "BLI_alloca.h" +#include "BLI_math.h" +#include "BLI_memarena.h" +#include "BLI_polyfill_2d.h" #include "BLI_stack.h" #include "BLI_task.h" +#include "BLI_utildefines.h" #include "BKE_customdata.h" #include "BKE_global.h" diff --git a/source/blender/blenkernel/intern/mesh_mapping.c b/source/blender/blenkernel/intern/mesh_mapping.c index d908a248a28..4ed9b31dbb5 100644 --- a/source/blender/blenkernel/intern/mesh_mapping.c +++ b/source/blender/blenkernel/intern/mesh_mapping.c @@ -26,13 +26,13 @@ #include "DNA_meshdata_types.h" #include "DNA_vec_types.h" -#include "BLI_buffer.h" -#include "BLI_utildefines.h" #include "BLI_bitmap.h" +#include "BLI_buffer.h" #include "BLI_math.h" +#include "BLI_utildefines.h" -#include "BKE_mesh_mapping.h" #include "BKE_customdata.h" +#include "BKE_mesh_mapping.h" #include "BLI_memarena.h" #include "BLI_strict_flags.h" diff --git a/source/blender/blenkernel/intern/mesh_merge.c b/source/blender/blenkernel/intern/mesh_merge.c index d646e988c60..1b9b8ea6572 100644 --- a/source/blender/blenkernel/intern/mesh_merge.c +++ b/source/blender/blenkernel/intern/mesh_merge.c @@ -27,10 +27,10 @@ #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "BLI_utildefines.h" -#include "BLI_utildefines_stack.h" #include "BLI_edgehash.h" #include "BLI_ghash.h" +#include "BLI_utildefines.h" +#include "BLI_utildefines_stack.h" #include "BKE_customdata.h" #include "BKE_lib_id.h" diff --git a/source/blender/blenkernel/intern/mesh_mirror.c b/source/blender/blenkernel/intern/mesh_mirror.c index e2f298a3fb1..9799d97d1cc 100644 --- a/source/blender/blenkernel/intern/mesh_mirror.c +++ b/source/blender/blenkernel/intern/mesh_mirror.c @@ -27,12 +27,12 @@ #include "DNA_meshdata_types.h" #include "DNA_object_types.h" +#include "BKE_deform.h" #include "BKE_lib_id.h" #include "BKE_lib_query.h" #include "BKE_mesh.h" #include "BKE_mesh_mirror.h" #include "BKE_modifier.h" -#include "BKE_deform.h" #include "bmesh.h" #include "bmesh_tools.h" diff --git a/source/blender/blenkernel/intern/mesh_remap.c b/source/blender/blenkernel/intern/mesh_remap.c index 834008ca1ac..d09205b5744 100644 --- a/source/blender/blenkernel/intern/mesh_remap.c +++ b/source/blender/blenkernel/intern/mesh_remap.c @@ -29,7 +29,6 @@ #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "BLI_utildefines.h" #include "BLI_alloca.h" #include "BLI_astar.h" #include "BLI_bitmap.h" @@ -37,6 +36,7 @@ #include "BLI_memarena.h" #include "BLI_polyfill_2d.h" #include "BLI_rand.h" +#include "BLI_utildefines.h" #include "BKE_bvhutils.h" #include "BKE_customdata.h" diff --git a/source/blender/blenkernel/intern/mesh_remesh_voxel.c b/source/blender/blenkernel/intern/mesh_remesh_voxel.c index 983c19857dd..3daf9f2752e 100644 --- a/source/blender/blenkernel/intern/mesh_remesh_voxel.c +++ b/source/blender/blenkernel/intern/mesh_remesh_voxel.c @@ -21,12 +21,12 @@ * \ingroup bke */ +#include +#include +#include #include #include -#include #include -#include -#include #include "MEM_guardedalloc.h" @@ -34,17 +34,17 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#include "DNA_object_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" +#include "DNA_object_types.h" +#include "BKE_bvhutils.h" +#include "BKE_customdata.h" #include "BKE_editmesh.h" -#include "BKE_mesh.h" -#include "BKE_mesh_runtime.h" #include "BKE_lib_id.h" -#include "BKE_customdata.h" -#include "BKE_bvhutils.h" +#include "BKE_mesh.h" #include "BKE_mesh_remesh_voxel.h" /* own include */ +#include "BKE_mesh_runtime.h" #include "bmesh_tools.h" diff --git a/source/blender/blenkernel/intern/mesh_runtime.c b/source/blender/blenkernel/intern/mesh_runtime.c index 3e21e044a02..aa3586d1e3d 100644 --- a/source/blender/blenkernel/intern/mesh_runtime.c +++ b/source/blender/blenkernel/intern/mesh_runtime.c @@ -36,8 +36,8 @@ #include "BKE_lib_id.h" #include "BKE_mesh.h" #include "BKE_mesh_runtime.h" -#include "BKE_subdiv_ccg.h" #include "BKE_shrinkwrap.h" +#include "BKE_subdiv_ccg.h" /* -------------------------------------------------------------------- */ /** \name Mesh Runtime Struct Utils diff --git a/source/blender/blenkernel/intern/mesh_tangent.c b/source/blender/blenkernel/intern/mesh_tangent.c index 19d94be9b6e..ebc3e9c490a 100644 --- a/source/blender/blenkernel/intern/mesh_tangent.c +++ b/source/blender/blenkernel/intern/mesh_tangent.c @@ -30,14 +30,14 @@ #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "BLI_utildefines.h" #include "BLI_math.h" #include "BLI_task.h" +#include "BLI_utildefines.h" #include "BKE_customdata.h" #include "BKE_mesh.h" -#include "BKE_mesh_tangent.h" #include "BKE_mesh_runtime.h" +#include "BKE_mesh_tangent.h" #include "BKE_report.h" #include "BLI_strict_flags.h" diff --git a/source/blender/blenkernel/intern/mesh_validate.c b/source/blender/blenkernel/intern/mesh_validate.c index 1c9fc644341..3343d41b13c 100644 --- a/source/blender/blenkernel/intern/mesh_validate.c +++ b/source/blender/blenkernel/intern/mesh_validate.c @@ -21,10 +21,10 @@ * \ingroup bke */ +#include #include #include #include -#include #include "CLG_log.h" @@ -34,10 +34,10 @@ #include "BLI_sys_types.h" -#include "BLI_utildefines.h" #include "BLI_edgehash.h" #include "BLI_math_base.h" #include "BLI_math_vector.h" +#include "BLI_utildefines.h" #include "BKE_customdata.h" #include "BKE_deform.h" diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index 381e43241ea..92cfc90ec3d 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -24,12 +24,12 @@ * \ingroup bke */ -#include +#include +#include +#include #include +#include #include -#include -#include -#include #include "MEM_guardedalloc.h" @@ -38,15 +38,16 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BLI_utildefines.h" -#include "BLI_listbase.h" #include "BLI_linklist.h" +#include "BLI_listbase.h" #include "BLI_path_util.h" #include "BLI_string.h" #include "BLI_string_utils.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" +#include "BKE_DerivedMesh.h" #include "BKE_appdir.h" #include "BKE_editmesh.h" #include "BKE_global.h" @@ -57,7 +58,6 @@ #include "BKE_mesh.h" #include "BKE_multires.h" #include "BKE_object.h" -#include "BKE_DerivedMesh.h" /* may move these, only for modifier_path_relbase */ #include "BKE_main.h" diff --git a/source/blender/blenkernel/intern/movieclip.c b/source/blender/blenkernel/intern/movieclip.c index f91047f1cd4..1935dc0cf6f 100644 --- a/source/blender/blenkernel/intern/movieclip.c +++ b/source/blender/blenkernel/intern/movieclip.c @@ -21,9 +21,9 @@ * \ingroup bke */ +#include #include #include -#include #ifndef WIN32 # include @@ -36,12 +36,12 @@ #include "MEM_guardedalloc.h" #include "DNA_constraint_types.h" -#include "DNA_screen_types.h" -#include "DNA_space_types.h" #include "DNA_movieclip_types.h" #include "DNA_node_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" +#include "DNA_screen_types.h" +#include "DNA_space_types.h" #include "DNA_view3d_types.h" #include "BLI_utildefines.h" @@ -57,15 +57,15 @@ #include "BKE_colortools.h" #include "BKE_global.h" #include "BKE_idtype.h" +#include "BKE_image.h" /* openanim */ #include "BKE_lib_id.h" #include "BKE_main.h" #include "BKE_movieclip.h" #include "BKE_node.h" -#include "BKE_image.h" /* openanim */ #include "BKE_tracking.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "IMB_moviecache.h" #include "DEG_depsgraph.h" diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c index 234273b5158..f7a3489f02e 100644 --- a/source/blender/blenkernel/intern/multires.c +++ b/source/blender/blenkernel/intern/multires.c @@ -34,22 +34,22 @@ #include "BLI_bitmap.h" #include "BLI_blenlib.h" #include "BLI_math.h" -#include "BLI_utildefines.h" #include "BLI_task.h" +#include "BLI_utildefines.h" -#include "BKE_pbvh.h" #include "BKE_ccg.h" #include "BKE_cdderivedmesh.h" +#include "BKE_editmesh.h" #include "BKE_mesh.h" #include "BKE_mesh_mapping.h" #include "BKE_mesh_runtime.h" #include "BKE_modifier.h" #include "BKE_multires.h" #include "BKE_paint.h" +#include "BKE_pbvh.h" #include "BKE_scene.h" #include "BKE_subdiv_ccg.h" #include "BKE_subsurf.h" -#include "BKE_editmesh.h" #include "BKE_object.h" diff --git a/source/blender/blenkernel/intern/multires_reshape_apply_base.c b/source/blender/blenkernel/intern/multires_reshape_apply_base.c index 62418150ff1..d480c46f2d0 100644 --- a/source/blender/blenkernel/intern/multires_reshape_apply_base.c +++ b/source/blender/blenkernel/intern/multires_reshape_apply_base.c @@ -30,14 +30,14 @@ #include "DNA_modifier_types.h" #include "DNA_object_types.h" -#include "BLI_math_vector.h" #include "BLI_listbase.h" +#include "BLI_math_vector.h" #include "BKE_customdata.h" #include "BKE_lib_id.h" #include "BKE_mesh.h" -#include "BKE_mesh_runtime.h" #include "BKE_mesh_mapping.h" +#include "BKE_mesh_runtime.h" #include "BKE_multires.h" #include "BKE_subdiv_eval.h" diff --git a/source/blender/blenkernel/intern/multires_reshape_smooth.c b/source/blender/blenkernel/intern/multires_reshape_smooth.c index 0a9a17d7bd8..eb06a0e9dec 100644 --- a/source/blender/blenkernel/intern/multires_reshape_smooth.c +++ b/source/blender/blenkernel/intern/multires_reshape_smooth.c @@ -28,9 +28,9 @@ #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "BLI_utildefines.h" #include "BLI_math_vector.h" #include "BLI_task.h" +#include "BLI_utildefines.h" #include "BKE_multires.h" #include "BKE_subdiv.h" diff --git a/source/blender/blenkernel/intern/multires_reshape_util.c b/source/blender/blenkernel/intern/multires_reshape_util.c index 5401fe2dcda..495b60c1238 100644 --- a/source/blender/blenkernel/intern/multires_reshape_util.c +++ b/source/blender/blenkernel/intern/multires_reshape_util.c @@ -26,9 +26,9 @@ #include "MEM_guardedalloc.h" #include "DNA_mesh_types.h" -#include "DNA_scene_types.h" #include "DNA_modifier_types.h" #include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BLI_task.h" @@ -36,8 +36,8 @@ #include "BKE_mesh_runtime.h" #include "BKE_multires.h" #include "BKE_subdiv.h" -#include "BKE_subdiv_eval.h" #include "BKE_subdiv_ccg.h" +#include "BKE_subdiv_eval.h" #include "BKE_subdiv_foreach.h" #include "BKE_subdiv_mesh.h" diff --git a/source/blender/blenkernel/intern/nla.c b/source/blender/blenkernel/intern/nla.c index 2a29644f0d7..6edccbccc76 100644 --- a/source/blender/blenkernel/intern/nla.c +++ b/source/blender/blenkernel/intern/nla.c @@ -21,22 +21,22 @@ * \ingroup bke */ -#include +#include +#include #include #include +#include #include -#include -#include #include "CLG_log.h" #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" +#include "BLI_ghash.h" #include "BLI_listbase.h" #include "BLI_string.h" #include "BLI_string_utils.h" -#include "BLI_ghash.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index 8ddb78bcc17..06ddf4a8582 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -25,23 +25,23 @@ #include "MEM_guardedalloc.h" -#include +#include #include +#include #include -#include #include "DNA_action_types.h" #include "DNA_anim_types.h" #include "DNA_light_types.h" +#include "DNA_linestyle_types.h" #include "DNA_material_types.h" #include "DNA_node_types.h" #include "DNA_scene_types.h" #include "DNA_texture_types.h" #include "DNA_world_types.h" -#include "DNA_linestyle_types.h" -#include "BLI_listbase.h" #include "BLI_ghash.h" +#include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_path_util.h" #include "BLI_string.h" @@ -63,10 +63,10 @@ #include "RNA_access.h" #include "RNA_define.h" -#include "NOD_socket.h" #include "NOD_common.h" #include "NOD_composite.h" #include "NOD_shader.h" +#include "NOD_socket.h" #include "NOD_texture.h" #include "DEG_depsgraph.h" diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 4e8ae3d57d5..7e1b21717b4 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -21,9 +21,9 @@ * \ingroup bke */ -#include #include #include +#include #include "CLG_log.h" @@ -34,17 +34,21 @@ #include "DNA_camera_types.h" #include "DNA_collection_types.h" #include "DNA_constraint_types.h" -#include "DNA_gpencil_types.h" +#include "DNA_defaults.h" +#include "DNA_fluid_types.h" #include "DNA_gpencil_modifier_types.h" +#include "DNA_gpencil_types.h" #include "DNA_key_types.h" -#include "DNA_light_types.h" #include "DNA_lattice_types.h" -#include "DNA_fluid_types.h" +#include "DNA_light_types.h" +#include "DNA_lightprobe_types.h" #include "DNA_material_types.h" -#include "DNA_meta_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" +#include "DNA_meta_types.h" #include "DNA_movieclip_types.h" +#include "DNA_object_types.h" +#include "DNA_rigidbody_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" #include "DNA_sequence_types.h" @@ -52,51 +56,52 @@ #include "DNA_space_types.h" #include "DNA_view3d_types.h" #include "DNA_world_types.h" -#include "DNA_object_types.h" -#include "DNA_lightprobe_types.h" -#include "DNA_rigidbody_types.h" -#include "DNA_defaults.h" #include "BLI_blenlib.h" +#include "BLI_kdtree.h" +#include "BLI_linklist.h" #include "BLI_math.h" #include "BLI_threads.h" #include "BLI_utildefines.h" -#include "BLI_linklist.h" -#include "BLI_kdtree.h" #include "BLT_translation.h" -#include "BKE_pbvh.h" -#include "BKE_main.h" -#include "BKE_global.h" -#include "BKE_idprop.h" -#include "BKE_armature.h" -#include "BKE_action.h" -#include "BKE_deform.h" #include "BKE_DerivedMesh.h" -#include "BKE_animsys.h" +#include "BKE_action.h" #include "BKE_anim.h" +#include "BKE_animsys.h" +#include "BKE_armature.h" +#include "BKE_camera.h" #include "BKE_collection.h" #include "BKE_constraint.h" #include "BKE_curve.h" +#include "BKE_deform.h" #include "BKE_displist.h" +#include "BKE_editmesh.h" #include "BKE_effect.h" -#include "BKE_font.h" #include "BKE_fcurve.h" +#include "BKE_font.h" +#include "BKE_global.h" +#include "BKE_gpencil.h" #include "BKE_gpencil_modifier.h" +#include "BKE_hair.h" #include "BKE_icons.h" +#include "BKE_idprop.h" #include "BKE_idtype.h" +#include "BKE_image.h" #include "BKE_key.h" -#include "BKE_light.h" -#include "BKE_layer.h" #include "BKE_lattice.h" +#include "BKE_layer.h" #include "BKE_lib_id.h" #include "BKE_lib_query.h" #include "BKE_lib_remap.h" +#include "BKE_light.h" +#include "BKE_lightprobe.h" #include "BKE_linestyle.h" -#include "BKE_mesh.h" -#include "BKE_editmesh.h" +#include "BKE_main.h" +#include "BKE_material.h" #include "BKE_mball.h" +#include "BKE_mesh.h" #include "BKE_modifier.h" #include "BKE_multires.h" #include "BKE_node.h" @@ -104,22 +109,17 @@ #include "BKE_object_facemap.h" #include "BKE_paint.h" #include "BKE_particle.h" +#include "BKE_pbvh.h" #include "BKE_pointcache.h" -#include "BKE_lightprobe.h" +#include "BKE_pointcloud.h" #include "BKE_rigidbody.h" #include "BKE_scene.h" #include "BKE_sequencer.h" #include "BKE_shader_fx.h" -#include "BKE_speaker.h" #include "BKE_softbody.h" -#include "BKE_subsurf.h" +#include "BKE_speaker.h" #include "BKE_subdiv_ccg.h" -#include "BKE_material.h" -#include "BKE_camera.h" -#include "BKE_image.h" -#include "BKE_gpencil.h" -#include "BKE_hair.h" -#include "BKE_pointcloud.h" +#include "BKE_subsurf.h" #include "BKE_volume.h" #include "DEG_depsgraph.h" diff --git a/source/blender/blenkernel/intern/object_deform.c b/source/blender/blenkernel/intern/object_deform.c index 32b63313853..a75180867cb 100644 --- a/source/blender/blenkernel/intern/object_deform.c +++ b/source/blender/blenkernel/intern/object_deform.c @@ -25,31 +25,31 @@ #include "BLT_translation.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_listbase.h" #include "BLI_string_utils.h" +#include "BLI_utildefines.h" #include "DNA_armature_types.h" #include "DNA_cloth_types.h" #include "DNA_curve_types.h" #include "DNA_lattice_types.h" -#include "DNA_meshdata_types.h" #include "DNA_mesh_types.h" +#include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" -#include "DNA_object_types.h" #include "DNA_object_force_types.h" +#include "DNA_object_types.h" #include "DNA_particle_types.h" #include "DNA_scene_types.h" #include "BKE_action.h" #include "BKE_deform.h" #include "BKE_editmesh.h" -#include "BKE_object_deform.h" /* own include */ -#include "BKE_object.h" +#include "BKE_gpencil.h" #include "BKE_mesh.h" #include "BKE_modifier.h" -#include "BKE_gpencil.h" +#include "BKE_object.h" +#include "BKE_object_deform.h" /* own include */ /** \name Misc helpers * \{ */ diff --git a/source/blender/blenkernel/intern/object_dupli.c b/source/blender/blenkernel/intern/object_dupli.c index 28b6e0d4e02..1217d230d0d 100644 --- a/source/blender/blenkernel/intern/object_dupli.c +++ b/source/blender/blenkernel/intern/object_dupli.c @@ -22,8 +22,8 @@ */ #include -#include #include +#include #include "MEM_guardedalloc.h" @@ -40,8 +40,10 @@ #include "DNA_scene_types.h" #include "DNA_vfont_types.h" +#include "BKE_anim.h" #include "BKE_animsys.h" #include "BKE_collection.h" +#include "BKE_editmesh.h" #include "BKE_font.h" #include "BKE_global.h" #include "BKE_idprop.h" @@ -53,14 +55,12 @@ #include "BKE_object.h" #include "BKE_particle.h" #include "BKE_scene.h" -#include "BKE_editmesh.h" -#include "BKE_anim.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" -#include "BLI_strict_flags.h" #include "BLI_hash.h" +#include "BLI_strict_flags.h" /* Dupli-Geometry */ diff --git a/source/blender/blenkernel/intern/object_facemap.c b/source/blender/blenkernel/intern/object_facemap.c index be96927ed63..10a3e35e382 100644 --- a/source/blender/blenkernel/intern/object_facemap.c +++ b/source/blender/blenkernel/intern/object_facemap.c @@ -23,26 +23,26 @@ #include -#include "DNA_object_types.h" #include "DNA_mesh_types.h" +#include "DNA_object_types.h" -#include "BLI_utildefines.h" +#include "BLI_listbase.h" #include "BLI_string.h" #include "BLI_string_utils.h" -#include "BLI_listbase.h" +#include "BLI_utildefines.h" #include "BKE_customdata.h" #include "BKE_editmesh.h" #include "BKE_object.h" -#include "BKE_object_facemap.h" /* own include */ #include "BKE_object_deform.h" +#include "BKE_object_facemap.h" /* own include */ #include "BLT_translation.h" #include "MEM_guardedalloc.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" static bool fmap_unique_check(void *arg, const char *name) { diff --git a/source/blender/blenkernel/intern/object_update.c b/source/blender/blenkernel/intern/object_update.c index 66c3b2ea26e..dd06e4f1753 100644 --- a/source/blender/blenkernel/intern/object_update.c +++ b/source/blender/blenkernel/intern/object_update.c @@ -31,26 +31,27 @@ #include "DNA_scene_types.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" -#include "BLI_threads.h" #include "BLI_math.h" +#include "BLI_threads.h" +#include "BLI_utildefines.h" +#include "BKE_DerivedMesh.h" +#include "BKE_action.h" #include "BKE_animsys.h" #include "BKE_armature.h" -#include "BKE_action.h" #include "BKE_constraint.h" #include "BKE_curve.h" -#include "BKE_DerivedMesh.h" #include "BKE_displist.h" #include "BKE_editmesh.h" #include "BKE_effect.h" +#include "BKE_gpencil.h" #include "BKE_gpencil_modifier.h" #include "BKE_hair.h" #include "BKE_image.h" #include "BKE_key.h" +#include "BKE_lattice.h" #include "BKE_layer.h" #include "BKE_light.h" -#include "BKE_lattice.h" #include "BKE_material.h" #include "BKE_mball.h" #include "BKE_mesh.h" @@ -59,7 +60,6 @@ #include "BKE_pointcache.h" #include "BKE_pointcloud.h" #include "BKE_scene.h" -#include "BKE_gpencil.h" #include "BKE_volume.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/blenkernel/intern/ocean_spectrum.c b/source/blender/blenkernel/intern/ocean_spectrum.c index 93018f4a5b0..1f7cc56f1a9 100644 --- a/source/blender/blenkernel/intern/ocean_spectrum.c +++ b/source/blender/blenkernel/intern/ocean_spectrum.c @@ -18,8 +18,8 @@ * \ingroup bke */ -#include "BLI_math.h" #include "BKE_ocean.h" +#include "BLI_math.h" #include "ocean_intern.h" #ifdef WITH_OCEANSIM diff --git a/source/blender/blenkernel/intern/outliner_treehash.c b/source/blender/blenkernel/intern/outliner_treehash.c index a58dfb59dd8..39618c95a68 100644 --- a/source/blender/blenkernel/intern/outliner_treehash.c +++ b/source/blender/blenkernel/intern/outliner_treehash.c @@ -23,9 +23,9 @@ #include #include -#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_mempool.h" +#include "BLI_utildefines.h" #include "DNA_outliner_types.h" diff --git a/source/blender/blenkernel/intern/packedFile.c b/source/blender/blenkernel/intern/packedFile.c index 34e86b29540..ff6aa09ec89 100644 --- a/source/blender/blenkernel/intern/packedFile.c +++ b/source/blender/blenkernel/intern/packedFile.c @@ -21,8 +21,8 @@ * \ingroup bke */ -#include #include +#include #include #ifndef WIN32 @@ -30,15 +30,15 @@ #else # include #endif -#include #include "MEM_guardedalloc.h" +#include -#include "DNA_image_types.h" #include "DNA_ID.h" +#include "DNA_image_types.h" #include "DNA_packedFile_types.h" #include "DNA_sound_types.h" -#include "DNA_volume_types.h" #include "DNA_vfont_types.h" +#include "DNA_volume_types.h" #include "BLI_blenlib.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c index eb21883f0dd..719336f7351 100644 --- a/source/blender/blenkernel/intern/paint.c +++ b/source/blender/blenkernel/intern/paint.c @@ -26,21 +26,21 @@ #include "MEM_guardedalloc.h" -#include "DNA_object_types.h" +#include "DNA_brush_types.h" +#include "DNA_gpencil_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_brush_types.h" #include "DNA_space_types.h" -#include "DNA_gpencil_types.h" #include "DNA_view3d_types.h" #include "DNA_workspace_types.h" #include "BLI_bitmap.h" -#include "BLI_utildefines.h" -#include "BLI_math_vector.h" #include "BLI_listbase.h" +#include "BLI_math_vector.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" @@ -48,15 +48,15 @@ #include "BKE_brush.h" #include "BKE_ccg.h" #include "BKE_colortools.h" -#include "BKE_deform.h" -#include "BKE_main.h" #include "BKE_context.h" #include "BKE_crazyspace.h" +#include "BKE_deform.h" #include "BKE_gpencil.h" #include "BKE_idtype.h" #include "BKE_image.h" #include "BKE_key.h" #include "BKE_lib_id.h" +#include "BKE_main.h" #include "BKE_mesh.h" #include "BKE_mesh_mapping.h" #include "BKE_mesh_runtime.h" diff --git a/source/blender/blenkernel/intern/paint_toolslots.c b/source/blender/blenkernel/intern/paint_toolslots.c index 7e58bf1eb8b..ea5cb168b12 100644 --- a/source/blender/blenkernel/intern/paint_toolslots.c +++ b/source/blender/blenkernel/intern/paint_toolslots.c @@ -22,15 +22,15 @@ #include "MEM_guardedalloc.h" +#include "DNA_brush_types.h" #include "DNA_modifier_types.h" #include "DNA_scene_types.h" -#include "DNA_brush_types.h" #include "BLI_utildefines.h" -#include "BKE_main.h" -#include "BKE_lib_id.h" #include "BKE_brush.h" +#include "BKE_lib_id.h" +#include "BKE_main.h" #include "BKE_paint.h" void BKE_paint_toolslots_len_ensure(Paint *paint, int len) diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index e5d0e2a4f21..f110a2bd3ae 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -21,32 +21,32 @@ * \ingroup bke */ -#include #include +#include #include #include "MEM_guardedalloc.h" #include "DNA_collection_types.h" #include "DNA_curve_types.h" +#include "DNA_dynamicpaint_types.h" +#include "DNA_fluid_types.h" #include "DNA_key_types.h" #include "DNA_material_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_particle_types.h" -#include "DNA_fluid_types.h" #include "DNA_scene_types.h" -#include "DNA_dynamicpaint_types.h" #include "BLI_blenlib.h" -#include "BLI_math.h" -#include "BLI_utildefines.h" #include "BLI_kdopbvh.h" #include "BLI_kdtree.h" +#include "BLI_linklist.h" +#include "BLI_math.h" #include "BLI_rand.h" #include "BLI_task.h" #include "BLI_threads.h" -#include "BLI_linklist.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" @@ -59,19 +59,19 @@ #include "BKE_colortools.h" #include "BKE_effect.h" #include "BKE_idtype.h" -#include "BKE_main.h" #include "BKE_lattice.h" +#include "BKE_main.h" +#include "BKE_deform.h" #include "BKE_displist.h" -#include "BKE_particle.h" -#include "BKE_material.h" #include "BKE_key.h" #include "BKE_lib_id.h" -#include "BKE_modifier.h" +#include "BKE_material.h" #include "BKE_mesh.h" +#include "BKE_modifier.h" +#include "BKE_particle.h" #include "BKE_pointcache.h" #include "BKE_scene.h" -#include "BKE_deform.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" diff --git a/source/blender/blenkernel/intern/particle_distribute.c b/source/blender/blenkernel/intern/particle_distribute.c index 7a0998a1ee7..9069f549e61 100644 --- a/source/blender/blenkernel/intern/particle_distribute.c +++ b/source/blender/blenkernel/intern/particle_distribute.c @@ -25,7 +25,6 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_jitter_2d.h" #include "BLI_kdtree.h" #include "BLI_math.h" @@ -33,6 +32,7 @@ #include "BLI_rand.h" #include "BLI_sort.h" #include "BLI_task.h" +#include "BLI_utildefines.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 2f6ffdfe607..cc49f500a5f 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -26,36 +26,36 @@ #include -#include #include +#include #include #include "MEM_guardedalloc.h" #include "DNA_anim_types.h" #include "DNA_boid_types.h" -#include "DNA_particle_types.h" +#include "DNA_curve_types.h" +#include "DNA_listBase.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" #include "DNA_object_force_types.h" #include "DNA_object_types.h" -#include "DNA_curve_types.h" +#include "DNA_particle_types.h" #include "DNA_scene_types.h" #include "DNA_texture_types.h" -#include "DNA_listBase.h" -#include "BLI_utildefines.h" -#include "BLI_edgehash.h" -#include "BLI_rand.h" -#include "BLI_math.h" #include "BLI_blenlib.h" -#include "BLI_kdtree.h" +#include "BLI_edgehash.h" #include "BLI_kdopbvh.h" -#include "BLI_task.h" -#include "BLI_threads.h" +#include "BLI_kdtree.h" #include "BLI_linklist.h" +#include "BLI_math.h" +#include "BLI_rand.h" #include "BLI_string_utils.h" +#include "BLI_task.h" +#include "BLI_threads.h" +#include "BLI_utildefines.h" #include "BKE_animsys.h" #include "BKE_boids.h" @@ -66,16 +66,16 @@ #include "BKE_lib_query.h" #include "BKE_particle.h" -#include "BKE_collection.h" -#include "BKE_object.h" -#include "BKE_material.h" +#include "BKE_bvhutils.h" #include "BKE_cloth.h" +#include "BKE_collection.h" #include "BKE_lattice.h" -#include "BKE_pointcache.h" +#include "BKE_material.h" #include "BKE_mesh.h" #include "BKE_modifier.h" +#include "BKE_object.h" +#include "BKE_pointcache.h" #include "BKE_scene.h" -#include "BKE_bvhutils.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_physics.h" diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c index ae20e5d023d..9a4ce8acb11 100644 --- a/source/blender/blenkernel/intern/pbvh.c +++ b/source/blender/blenkernel/intern/pbvh.c @@ -23,19 +23,19 @@ #include "BLI_utildefines.h" #include "BLI_bitmap.h" -#include "BLI_math.h" #include "BLI_ghash.h" -#include "BLI_task.h" +#include "BLI_math.h" #include "BLI_rand.h" +#include "BLI_task.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "BKE_pbvh.h" #include "BKE_ccg.h" -#include "BKE_subdiv_ccg.h" #include "BKE_mesh.h" /* for BKE_mesh_calc_normals */ #include "BKE_paint.h" +#include "BKE_pbvh.h" +#include "BKE_subdiv_ccg.h" #include "PIL_time.h" diff --git a/source/blender/blenkernel/intern/pbvh_bmesh.c b/source/blender/blenkernel/intern/pbvh_bmesh.c index e30cf9a4a80..65820566fd5 100644 --- a/source/blender/blenkernel/intern/pbvh_bmesh.c +++ b/source/blender/blenkernel/intern/pbvh_bmesh.c @@ -20,15 +20,15 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_buffer.h" #include "BLI_ghash.h" #include "BLI_heap_simple.h" #include "BLI_math.h" #include "BLI_memarena.h" +#include "BLI_utildefines.h" -#include "BKE_ccg.h" #include "BKE_DerivedMesh.h" +#include "BKE_ccg.h" #include "BKE_pbvh.h" #include "GPU_buffers.h" diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c index 19d77fcd6db..76088867997 100644 --- a/source/blender/blenkernel/intern/pointcache.c +++ b/source/blender/blenkernel/intern/pointcache.c @@ -21,8 +21,8 @@ * \ingroup bke */ -#include #include +#include #include #include #include @@ -34,13 +34,13 @@ #include "DNA_ID.h" #include "DNA_collection_types.h" #include "DNA_dynamicpaint_types.h" +#include "DNA_fluid_types.h" #include "DNA_modifier_types.h" -#include "DNA_object_types.h" #include "DNA_object_force_types.h" +#include "DNA_object_types.h" #include "DNA_particle_types.h" #include "DNA_rigidbody_types.h" #include "DNA_scene_types.h" -#include "DNA_fluid_types.h" #include "BLI_blenlib.h" #include "BLI_math.h" @@ -51,11 +51,12 @@ #include "PIL_time.h" -#include "BKE_appdir.h" #include "BKE_anim.h" +#include "BKE_appdir.h" #include "BKE_cloth.h" #include "BKE_collection.h" #include "BKE_dynamicpaint.h" +#include "BKE_fluid.h" #include "BKE_global.h" #include "BKE_lib_id.h" #include "BKE_main.h" @@ -64,7 +65,6 @@ #include "BKE_particle.h" #include "BKE_pointcache.h" #include "BKE_scene.h" -#include "BKE_fluid.h" #include "BKE_softbody.h" #include "BIK_api.h" diff --git a/source/blender/blenkernel/intern/pointcloud.c b/source/blender/blenkernel/intern/pointcloud.c index cc68e93a116..2f346183873 100644 --- a/source/blender/blenkernel/intern/pointcloud.c +++ b/source/blender/blenkernel/intern/pointcloud.c @@ -36,8 +36,8 @@ #include "BKE_animsys.h" #include "BKE_customdata.h" -#include "BKE_idtype.h" #include "BKE_global.h" +#include "BKE_idtype.h" #include "BKE_lib_id.h" #include "BKE_lib_query.h" #include "BKE_lib_remap.h" diff --git a/source/blender/blenkernel/intern/report.c b/source/blender/blenkernel/intern/report.c index 9719fda11cc..43ab1a71647 100644 --- a/source/blender/blenkernel/intern/report.c +++ b/source/blender/blenkernel/intern/report.c @@ -21,10 +21,10 @@ * \ingroup bke */ +#include #include #include #include -#include #include "MEM_guardedalloc.h" @@ -34,8 +34,8 @@ #include "BLT_translation.h" -#include "BKE_report.h" #include "BKE_global.h" /* G.background only */ +#include "BKE_report.h" const char *BKE_report_type_str(ReportType type) { diff --git a/source/blender/blenkernel/intern/rigidbody.c b/source/blender/blenkernel/intern/rigidbody.c index 494c5e21613..f08de835a9d 100644 --- a/source/blender/blenkernel/intern/rigidbody.c +++ b/source/blender/blenkernel/intern/rigidbody.c @@ -22,19 +22,19 @@ * \brief Blender-side interface and methods for dealing with Rigid Body simulations */ -#include -#include -#include #include -#include #include +#include +#include +#include +#include #include "CLG_log.h" #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_listbase.h" +#include "BLI_math.h" #ifdef WITH_BULLET # include "RBI_api.h" @@ -44,8 +44,8 @@ #include "DNA_collection_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "DNA_object_types.h" #include "DNA_object_force_types.h" +#include "DNA_object_types.h" #include "DNA_rigidbody_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index ff0232ed9aa..23bd7ae3c8c 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -30,6 +30,8 @@ #include "DNA_anim_types.h" #include "DNA_collection_types.h" #include "DNA_curveprofile_types.h" +#include "DNA_defaults.h" +#include "DNA_gpencil_types.h" #include "DNA_linestyle_types.h" #include "DNA_mesh_types.h" #include "DNA_node_types.h" @@ -43,28 +45,27 @@ #include "DNA_view3d_types.h" #include "DNA_windowmanager_types.h" #include "DNA_workspace_types.h" -#include "DNA_gpencil_types.h" #include "DNA_world_types.h" -#include "DNA_defaults.h" -#include "BLI_math.h" -#include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BKE_callbacks.h" +#include "BLI_blenlib.h" +#include "BLI_math.h" #include "BLI_string.h" #include "BLI_string_utils.h" -#include "BLI_threads.h" #include "BLI_task.h" +#include "BLI_threads.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" +#include "BKE_action.h" #include "BKE_anim.h" #include "BKE_animsys.h" -#include "BKE_action.h" #include "BKE_armature.h" #include "BKE_cachefile.h" #include "BKE_collection.h" #include "BKE_colortools.h" +#include "BKE_curveprofile.h" #include "BKE_editmesh.h" #include "BKE_fcurve.h" #include "BKE_freestyle.h" @@ -82,7 +83,6 @@ #include "BKE_node.h" #include "BKE_object.h" #include "BKE_paint.h" -#include "BKE_curveprofile.h" #include "BKE_rigidbody.h" #include "BKE_scene.h" #include "BKE_screen.h" diff --git a/source/blender/blenkernel/intern/screen.c b/source/blender/blenkernel/intern/screen.c index 3815cb9f59a..dbf460fdea2 100644 --- a/source/blender/blenkernel/intern/screen.c +++ b/source/blender/blenkernel/intern/screen.c @@ -25,21 +25,21 @@ # include "BLI_winstuff.h" #endif -#include -#include #include +#include +#include #include "MEM_guardedalloc.h" +#include "DNA_defaults.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" #include "DNA_space_types.h" #include "DNA_view3d_types.h" #include "DNA_workspace_types.h" -#include "DNA_defaults.h" -#include "BLI_math_vector.h" #include "BLI_listbase.h" +#include "BLI_math_vector.h" #include "BLI_rect.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/seqcache.c b/source/blender/blenkernel/intern/seqcache.c index 6b1538655d3..d48930e5665 100644 --- a/source/blender/blenkernel/intern/seqcache.c +++ b/source/blender/blenkernel/intern/seqcache.c @@ -20,34 +20,34 @@ * \ingroup bke */ -#include #include +#include #include #include "MEM_guardedalloc.h" -#include "DNA_sequence_types.h" #include "DNA_scene_types.h" +#include "DNA_sequence_types.h" #include "DNA_space_types.h" /* for FILE_MAX. */ +#include "IMB_colormanagement.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" -#include "IMB_colormanagement.h" -#include "BLI_mempool.h" -#include "BLI_threads.h" -#include "BLI_listbase.h" -#include "BLI_ghash.h" #include "BLI_blenlib.h" #include "BLI_endian_switch.h" #include "BLI_fileops.h" #include "BLI_fileops_types.h" +#include "BLI_ghash.h" +#include "BLI_listbase.h" +#include "BLI_mempool.h" #include "BLI_path_util.h" +#include "BLI_threads.h" #include "BKE_global.h" -#include "BKE_sequencer.h" -#include "BKE_scene.h" #include "BKE_main.h" +#include "BKE_scene.h" +#include "BKE_sequencer.h" /** * Sequencer Cache Design Notes diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c index 3f9cba4cfbc..70f92c6d6bd 100644 --- a/source/blender/blenkernel/intern/seqeffects.c +++ b/source/blender/blenkernel/intern/seqeffects.c @@ -24,22 +24,22 @@ * \ingroup bke */ -#include #include #include +#include #include "MEM_guardedalloc.h" #include "BLI_math.h" /* windows needs for M_PI */ -#include "BLI_threads.h" -#include "BLI_utildefines.h" -#include "BLI_rect.h" #include "BLI_path_util.h" +#include "BLI_rect.h" #include "BLI_string.h" +#include "BLI_threads.h" +#include "BLI_utildefines.h" +#include "DNA_anim_types.h" #include "DNA_scene_types.h" #include "DNA_sequence_types.h" -#include "DNA_anim_types.h" #include "DNA_space_types.h" #include "BKE_fcurve.h" @@ -47,9 +47,9 @@ #include "BKE_main.h" #include "BKE_sequencer.h" -#include "IMB_imbuf_types.h" -#include "IMB_imbuf.h" #include "IMB_colormanagement.h" +#include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "IMB_metadata.h" #include "BLI_math_color_blend.h" diff --git a/source/blender/blenkernel/intern/seqmodifier.c b/source/blender/blenkernel/intern/seqmodifier.c index 23ca6c95ffb..80ad8561333 100644 --- a/source/blender/blenkernel/intern/seqmodifier.c +++ b/source/blender/blenkernel/intern/seqmodifier.c @@ -27,23 +27,23 @@ #include "MEM_guardedalloc.h" #include "BLI_listbase.h" +#include "BLI_math.h" #include "BLI_string.h" #include "BLI_string_utils.h" #include "BLI_utildefines.h" -#include "BLI_math.h" #include "BLT_translation.h" #include "DNA_mask_types.h" -#include "DNA_sequence_types.h" #include "DNA_scene_types.h" +#include "DNA_sequence_types.h" #include "BKE_colortools.h" #include "BKE_sequencer.h" +#include "IMB_colormanagement.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" -#include "IMB_colormanagement.h" static SequenceModifierTypeInfo *modifiersTypes[NUM_SEQUENCE_MODIFIER_TYPES]; static bool modifierTypesInit = false; diff --git a/source/blender/blenkernel/intern/seqprefetch.c b/source/blender/blenkernel/intern/seqprefetch.c index 915935addcd..8c7d119857a 100644 --- a/source/blender/blenkernel/intern/seqprefetch.c +++ b/source/blender/blenkernel/intern/seqprefetch.c @@ -27,11 +27,11 @@ #include "MEM_guardedalloc.h" -#include "DNA_sequence_types.h" +#include "DNA_anim_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" +#include "DNA_sequence_types.h" #include "DNA_windowmanager_types.h" -#include "DNA_anim_types.h" #include "BLI_listbase.h" #include "BLI_threads.h" @@ -40,12 +40,12 @@ #include "IMB_imbuf_types.h" #include "BKE_animsys.h" +#include "BKE_context.h" +#include "BKE_layer.h" #include "BKE_lib_id.h" -#include "BKE_scene.h" #include "BKE_main.h" -#include "BKE_context.h" +#include "BKE_scene.h" #include "BKE_sequencer.h" -#include "BKE_layer.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index b5e2b96d239..9fb28fe250a 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -31,19 +31,19 @@ #include "MEM_guardedalloc.h" -#include "DNA_sequence_types.h" -#include "DNA_movieclip_types.h" -#include "DNA_mask_types.h" -#include "DNA_scene_types.h" #include "DNA_anim_types.h" +#include "DNA_mask_types.h" +#include "DNA_movieclip_types.h" #include "DNA_object_types.h" +#include "DNA_scene_types.h" +#include "DNA_sequence_types.h" #include "DNA_sound_types.h" #include "DNA_space_types.h" -#include "BLI_math.h" #include "BLI_fileops.h" -#include "BLI_listbase.h" #include "BLI_linklist.h" +#include "BLI_listbase.h" +#include "BLI_math.h" #include "BLI_path_util.h" #include "BLI_string.h" #include "BLI_string_utf8.h" @@ -59,18 +59,18 @@ #include "BLT_translation.h" #include "BKE_animsys.h" +#include "BKE_fcurve.h" #include "BKE_global.h" +#include "BKE_idprop.h" #include "BKE_image.h" #include "BKE_layer.h" +#include "BKE_lib_id.h" #include "BKE_main.h" -#include "BKE_sequencer.h" -#include "BKE_sequencer_offscreen.h" +#include "BKE_mask.h" #include "BKE_movieclip.h" -#include "BKE_fcurve.h" #include "BKE_scene.h" -#include "BKE_mask.h" -#include "BKE_lib_id.h" -#include "BKE_idprop.h" +#include "BKE_sequencer.h" +#include "BKE_sequencer_offscreen.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" @@ -81,9 +81,9 @@ #include +#include "IMB_colormanagement.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" -#include "IMB_colormanagement.h" #include "IMB_metadata.h" #include "BKE_context.h" diff --git a/source/blender/blenkernel/intern/shader_fx.c b/source/blender/blenkernel/intern/shader_fx.c index 49799aff1d6..8d692782413 100644 --- a/source/blender/blenkernel/intern/shader_fx.c +++ b/source/blender/blenkernel/intern/shader_fx.c @@ -26,23 +26,23 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_math_vector.h" #include "BLI_string_utils.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" +#include "DNA_gpencil_types.h" #include "DNA_meshdata_types.h" -#include "DNA_scene_types.h" #include "DNA_object_types.h" -#include "DNA_gpencil_types.h" +#include "DNA_scene_types.h" #include "DNA_shader_fx_types.h" +#include "BKE_gpencil.h" #include "BKE_lib_id.h" #include "BKE_lib_query.h" -#include "BKE_gpencil.h" -#include "BKE_shader_fx.h" #include "BKE_object.h" +#include "BKE_shader_fx.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/blenkernel/intern/shrinkwrap.c b/source/blender/blenkernel/intern/shrinkwrap.c index 59f576e27ff..06086cdf56a 100644 --- a/source/blender/blenkernel/intern/shrinkwrap.c +++ b/source/blender/blenkernel/intern/shrinkwrap.c @@ -21,37 +21,37 @@ * \ingroup bke */ -#include +#include #include #include #include #include +#include #include -#include -#include "DNA_object_types.h" -#include "DNA_modifier_types.h" -#include "DNA_meshdata_types.h" #include "DNA_mesh_types.h" +#include "DNA_meshdata_types.h" +#include "DNA_modifier_types.h" +#include "DNA_object_types.h" #include "BLI_math.h" -#include "BLI_utildefines.h" -#include "BLI_task.h" #include "BLI_math_solvers.h" +#include "BLI_task.h" +#include "BLI_utildefines.h" -#include "BKE_context.h" -#include "BKE_shrinkwrap.h" -#include "BKE_cdderivedmesh.h" #include "BKE_DerivedMesh.h" +#include "BKE_cdderivedmesh.h" +#include "BKE_context.h" #include "BKE_lattice.h" #include "BKE_lib_id.h" #include "BKE_modifier.h" +#include "BKE_shrinkwrap.h" #include "BKE_deform.h" #include "BKE_editmesh.h" #include "BKE_mesh.h" /* for OMP limits. */ -#include "BKE_subsurf.h" #include "BKE_mesh_runtime.h" +#include "BKE_subsurf.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index 4eec5ac3605..c358dde449f 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -50,29 +50,29 @@ #include "DNA_collection_types.h" #include "DNA_curve_types.h" #include "DNA_lattice_types.h" -#include "DNA_meshdata_types.h" #include "DNA_mesh_types.h" +#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BLI_math.h" -#include "BLI_utildefines.h" -#include "BLI_listbase.h" #include "BLI_ghash.h" +#include "BLI_listbase.h" +#include "BLI_math.h" #include "BLI_threads.h" +#include "BLI_utildefines.h" #include "BKE_collection.h" #include "BKE_collision.h" #include "BKE_curve.h" +#include "BKE_deform.h" #include "BKE_effect.h" #include "BKE_global.h" #include "BKE_layer.h" +#include "BKE_mesh.h" #include "BKE_modifier.h" -#include "BKE_softbody.h" #include "BKE_pointcache.h" -#include "BKE_deform.h" -#include "BKE_mesh.h" #include "BKE_scene.h" +#include "BKE_softbody.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c index 47b02654104..5aa445c2146 100644 --- a/source/blender/blenkernel/intern/sound.c +++ b/source/blender/blenkernel/intern/sound.c @@ -21,8 +21,8 @@ * \ingroup bke */ -#include #include +#include #include "MEM_guardedalloc.h" @@ -35,30 +35,30 @@ #include "DNA_anim_types.h" #include "DNA_object_types.h" -#include "DNA_scene_types.h" -#include "DNA_sequence_types.h" #include "DNA_packedFile_types.h" +#include "DNA_scene_types.h" #include "DNA_screen_types.h" +#include "DNA_sequence_types.h" #include "DNA_sound_types.h" #include "DNA_speaker_types.h" #include "DNA_windowmanager_types.h" #ifdef WITH_AUDASPACE -# include -# include +# include "../../../intern/audaspace/intern/AUD_Set.h" # include +# include +# include # include -# include "../../../intern/audaspace/intern/AUD_Set.h" #endif #include "BKE_global.h" #include "BKE_idtype.h" -#include "BKE_main.h" -#include "BKE_sound.h" #include "BKE_lib_id.h" +#include "BKE_main.h" #include "BKE_packedFile.h" -#include "BKE_sequencer.h" #include "BKE_scene.h" +#include "BKE_sequencer.h" +#include "BKE_sound.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/blenkernel/intern/speaker.c b/source/blender/blenkernel/intern/speaker.c index 64a9e8a42ee..d81ebe0fb64 100644 --- a/source/blender/blenkernel/intern/speaker.c +++ b/source/blender/blenkernel/intern/speaker.c @@ -18,10 +18,10 @@ * \ingroup bke */ +#include "DNA_defaults.h" #include "DNA_object_types.h" #include "DNA_sound_types.h" #include "DNA_speaker_types.h" -#include "DNA_defaults.h" #include "BLI_math.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/studiolight.c b/source/blender/blenkernel/intern/studiolight.c index 18d11e4d4c6..5cb4703bc46 100644 --- a/source/blender/blenkernel/intern/studiolight.c +++ b/source/blender/blenkernel/intern/studiolight.c @@ -29,8 +29,8 @@ #include "BLI_dynstr.h" #include "BLI_fileops.h" #include "BLI_fileops_types.h" -#include "BLI_listbase.h" #include "BLI_linklist.h" +#include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_math_color.h" #include "BLI_path_util.h" diff --git a/source/blender/blenkernel/intern/subdiv_converter_mesh.c b/source/blender/blenkernel/intern/subdiv_converter_mesh.c index 60f80628f5a..a078648e68b 100644 --- a/source/blender/blenkernel/intern/subdiv_converter_mesh.c +++ b/source/blender/blenkernel/intern/subdiv_converter_mesh.c @@ -28,8 +28,8 @@ #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "BLI_utildefines.h" #include "BLI_bitmap.h" +#include "BLI_utildefines.h" #include "BKE_customdata.h" #include "BKE_mesh_mapping.h" diff --git a/source/blender/blenkernel/intern/subdiv_deform.c b/source/blender/blenkernel/intern/subdiv_deform.c index a686c44bf13..b5fd3ae63eb 100644 --- a/source/blender/blenkernel/intern/subdiv_deform.c +++ b/source/blender/blenkernel/intern/subdiv_deform.c @@ -28,8 +28,8 @@ #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "BLI_utildefines.h" #include "BLI_math_vector.h" +#include "BLI_utildefines.h" #include "BKE_customdata.h" #include "BKE_subdiv.h" diff --git a/source/blender/blenkernel/intern/subdiv_displacement_multires.c b/source/blender/blenkernel/intern/subdiv_displacement_multires.c index 50b2b3c7c46..617f37834f9 100644 --- a/source/blender/blenkernel/intern/subdiv_displacement_multires.c +++ b/source/blender/blenkernel/intern/subdiv_displacement_multires.c @@ -28,8 +28,8 @@ #include "DNA_modifier_types.h" #include "DNA_object_types.h" -#include "BLI_utildefines.h" #include "BLI_math_vector.h" +#include "BLI_utildefines.h" #include "BKE_customdata.h" #include "BKE_multires.h" diff --git a/source/blender/blenkernel/intern/subdiv_eval.c b/source/blender/blenkernel/intern/subdiv_eval.c index 726fde3e6bd..78e0e42753a 100644 --- a/source/blender/blenkernel/intern/subdiv_eval.c +++ b/source/blender/blenkernel/intern/subdiv_eval.c @@ -26,9 +26,9 @@ #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "BLI_utildefines.h" #include "BLI_bitmap.h" #include "BLI_math_vector.h" +#include "BLI_utildefines.h" #include "BKE_customdata.h" #include "BKE_subdiv.h" diff --git a/source/blender/blenkernel/intern/subdiv_foreach.c b/source/blender/blenkernel/intern/subdiv_foreach.c index 347e2843423..533279f4425 100644 --- a/source/blender/blenkernel/intern/subdiv_foreach.c +++ b/source/blender/blenkernel/intern/subdiv_foreach.c @@ -25,16 +25,16 @@ #include "atomic_ops.h" +#include "DNA_key_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "DNA_key_types.h" #include "BLI_bitmap.h" #include "BLI_task.h" #include "BKE_customdata.h" -#include "BKE_mesh.h" #include "BKE_key.h" +#include "BKE_mesh.h" #include "BKE_subdiv.h" #include "BKE_subdiv_mesh.h" diff --git a/source/blender/blenkernel/intern/subdiv_mesh.c b/source/blender/blenkernel/intern/subdiv_mesh.c index 6c9cd72363a..0bd6fc259c6 100644 --- a/source/blender/blenkernel/intern/subdiv_mesh.c +++ b/source/blender/blenkernel/intern/subdiv_mesh.c @@ -25,16 +25,16 @@ #include "atomic_ops.h" +#include "DNA_key_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "DNA_key_types.h" #include "BLI_alloca.h" #include "BLI_math_vector.h" #include "BKE_customdata.h" -#include "BKE_mesh.h" #include "BKE_key.h" +#include "BKE_mesh.h" #include "BKE_subdiv.h" #include "BKE_subdiv_eval.h" #include "BKE_subdiv_foreach.h" diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index da3c03cf705..c21d640a4c1 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -28,11 +28,11 @@ # define USE_DYNSIZE #endif +#include +#include +#include #include #include -#include -#include -#include #include "atomic_ops.h" @@ -44,7 +44,6 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BLI_utildefines.h" #include "BLI_bitmap.h" #include "BLI_blenlib.h" #include "BLI_edgehash.h" @@ -52,8 +51,8 @@ #include "BLI_memarena.h" #include "BLI_task.h" #include "BLI_threads.h" +#include "BLI_utildefines.h" -#include "BKE_pbvh.h" #include "BKE_ccg.h" #include "BKE_cdderivedmesh.h" #include "BKE_mesh.h" @@ -62,6 +61,7 @@ #include "BKE_multires.h" #include "BKE_object.h" #include "BKE_paint.h" +#include "BKE_pbvh.h" #include "BKE_scene.h" #include "BKE_subsurf.h" diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c index 847cd6841fe..94c41777cea 100644 --- a/source/blender/blenkernel/intern/text.c +++ b/source/blender/blenkernel/intern/text.c @@ -23,37 +23,37 @@ #include /* abort */ #include /* strstr */ -#include #include +#include #include #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" +#include "BLI_fileops.h" +#include "BLI_listbase.h" #include "BLI_path_util.h" #include "BLI_string.h" #include "BLI_string_cursor_utf8.h" #include "BLI_string_utf8.h" -#include "BLI_listbase.h" -#include "BLI_fileops.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" #include "DNA_constraint_types.h" +#include "DNA_material_types.h" +#include "DNA_node_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" #include "DNA_space_types.h" #include "DNA_text_types.h" #include "DNA_userdef_types.h" -#include "DNA_object_types.h" -#include "DNA_node_types.h" -#include "DNA_material_types.h" #include "BKE_idtype.h" #include "BKE_lib_id.h" #include "BKE_main.h" -#include "BKE_text.h" #include "BKE_node.h" +#include "BKE_text.h" #ifdef WITH_PYTHON # include "BPY_extern.h" diff --git a/source/blender/blenkernel/intern/text_suggestions.c b/source/blender/blenkernel/intern/text_suggestions.c index 64087369173..6df1aff722b 100644 --- a/source/blender/blenkernel/intern/text_suggestions.c +++ b/source/blender/blenkernel/intern/text_suggestions.c @@ -21,16 +21,16 @@ * \ingroup bke */ +#include #include #include -#include #include "MEM_guardedalloc.h" #include "BLI_string.h" -#include "DNA_text_types.h" #include "BKE_text_suggestions.h" /* Own include. */ +#include "DNA_text_types.h" /**********************/ /* Static definitions */ diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c index 6c4e19cb068..67f9bcf008c 100644 --- a/source/blender/blenkernel/intern/texture.c +++ b/source/blender/blenkernel/intern/texture.c @@ -21,46 +21,46 @@ * \ingroup bke */ +#include #include #include #include -#include #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_kdopbvh.h" -#include "BLI_utildefines.h" +#include "BLI_math.h" #include "BLI_math_color.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" +#include "DNA_brush_types.h" +#include "DNA_color_types.h" +#include "DNA_defaults.h" #include "DNA_key_types.h" -#include "DNA_object_types.h" +#include "DNA_linestyle_types.h" #include "DNA_material_types.h" -#include "DNA_brush_types.h" #include "DNA_node_types.h" -#include "DNA_color_types.h" +#include "DNA_object_types.h" #include "DNA_particle_types.h" -#include "DNA_linestyle_types.h" -#include "DNA_defaults.h" #include "IMB_imbuf.h" #include "BKE_main.h" +#include "BKE_animsys.h" #include "BKE_colorband.h" +#include "BKE_colortools.h" +#include "BKE_icons.h" #include "BKE_idtype.h" -#include "BKE_lib_id.h" #include "BKE_image.h" -#include "BKE_material.h" -#include "BKE_texture.h" #include "BKE_key.h" -#include "BKE_icons.h" +#include "BKE_lib_id.h" +#include "BKE_material.h" #include "BKE_node.h" -#include "BKE_animsys.h" -#include "BKE_colortools.h" #include "BKE_scene.h" +#include "BKE_texture.h" #include "RE_shader_ext.h" diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c index a9bd1d17567..0204667b3bd 100644 --- a/source/blender/blenkernel/intern/tracking.c +++ b/source/blender/blenkernel/intern/tracking.c @@ -21,42 +21,42 @@ * \ingroup bke */ -#include #include #include #include +#include #include "MEM_guardedalloc.h" #include "DNA_anim_types.h" -#include "DNA_gpencil_types.h" #include "DNA_camera_types.h" +#include "DNA_gpencil_types.h" #include "DNA_movieclip_types.h" #include "DNA_object_types.h" /* SELECT */ #include "DNA_scene_types.h" -#include "BLI_utildefines.h" #include "BLI_bitmap_draw_2d.h" #include "BLI_ghash.h" +#include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_math_base.h" -#include "BLI_listbase.h" #include "BLI_string.h" #include "BLI_string_utils.h" #include "BLI_threads.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" #include "BKE_fcurve.h" -#include "BKE_tracking.h" +#include "BKE_layer.h" #include "BKE_lib_id.h" #include "BKE_movieclip.h" #include "BKE_object.h" #include "BKE_scene.h" -#include "BKE_layer.h" +#include "BKE_tracking.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "RNA_access.h" diff --git a/source/blender/blenkernel/intern/tracking_auto.c b/source/blender/blenkernel/intern/tracking_auto.c index 9d8395defcd..e7a98ba1c3f 100644 --- a/source/blender/blenkernel/intern/tracking_auto.c +++ b/source/blender/blenkernel/intern/tracking_auto.c @@ -21,19 +21,19 @@ * \ingroup bke */ -#include #include "atomic_ops.h" +#include #include "MEM_guardedalloc.h" #include "DNA_movieclip_types.h" #include "DNA_object_types.h" /* SELECT */ -#include "BLI_utildefines.h" #include "BLI_listbase.h" +#include "BLI_math.h" #include "BLI_task.h" #include "BLI_threads.h" -#include "BLI_math.h" +#include "BLI_utildefines.h" #include "BKE_movieclip.h" #include "BKE_tracking.h" diff --git a/source/blender/blenkernel/intern/tracking_plane_tracker.c b/source/blender/blenkernel/intern/tracking_plane_tracker.c index e0e8a68bb1e..b787cd366c5 100644 --- a/source/blender/blenkernel/intern/tracking_plane_tracker.c +++ b/source/blender/blenkernel/intern/tracking_plane_tracker.c @@ -27,8 +27,8 @@ #include "DNA_movieclip_types.h" -#include "BLI_utildefines.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "BKE_tracking.h" diff --git a/source/blender/blenkernel/intern/tracking_region_tracker.c b/source/blender/blenkernel/intern/tracking_region_tracker.c index 967642c03a8..6e8d4146d12 100644 --- a/source/blender/blenkernel/intern/tracking_region_tracker.c +++ b/source/blender/blenkernel/intern/tracking_region_tracker.c @@ -28,14 +28,14 @@ #include "DNA_movieclip_types.h" -#include "BLI_utildefines.h" #include "BLI_threads.h" +#include "BLI_utildefines.h" -#include "BKE_tracking.h" #include "BKE_movieclip.h" +#include "BKE_tracking.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "libmv-capi.h" #include "tracking_private.h" diff --git a/source/blender/blenkernel/intern/tracking_solver.c b/source/blender/blenkernel/intern/tracking_solver.c index 3a82e375b0b..5c1f6caad9d 100644 --- a/source/blender/blenkernel/intern/tracking_solver.c +++ b/source/blender/blenkernel/intern/tracking_solver.c @@ -30,16 +30,16 @@ #include "DNA_anim_types.h" #include "DNA_movieclip_types.h" -#include "BLI_utildefines.h" -#include "BLI_math.h" #include "BLI_listbase.h" +#include "BLI_math.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" #include "BKE_fcurve.h" -#include "BKE_tracking.h" #include "BKE_movieclip.h" +#include "BKE_tracking.h" #include "RNA_access.h" diff --git a/source/blender/blenkernel/intern/tracking_stabilize.c b/source/blender/blenkernel/intern/tracking_stabilize.c index 32e7233060c..dffc703c943 100644 --- a/source/blender/blenkernel/intern/tracking_stabilize.c +++ b/source/blender/blenkernel/intern/tracking_stabilize.c @@ -25,26 +25,26 @@ #include +#include "DNA_anim_types.h" #include "DNA_movieclip_types.h" #include "DNA_scene_types.h" -#include "DNA_anim_types.h" #include "RNA_access.h" -#include "BLI_utildefines.h" -#include "BLI_sort_utils.h" #include "BLI_ghash.h" -#include "BLI_math_vector.h" #include "BLI_listbase.h" #include "BLI_math.h" +#include "BLI_math_vector.h" +#include "BLI_sort_utils.h" #include "BLI_task.h" +#include "BLI_utildefines.h" -#include "BKE_tracking.h" -#include "BKE_movieclip.h" #include "BKE_fcurve.h" +#include "BKE_movieclip.h" +#include "BKE_tracking.h" -#include "MEM_guardedalloc.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" +#include "MEM_guardedalloc.h" /* == Parameterization constants == */ diff --git a/source/blender/blenkernel/intern/tracking_util.c b/source/blender/blenkernel/intern/tracking_util.c index ada6ce96d58..51758abdf3f 100644 --- a/source/blender/blenkernel/intern/tracking_util.c +++ b/source/blender/blenkernel/intern/tracking_util.c @@ -30,20 +30,20 @@ #include "DNA_movieclip_types.h" -#include "BLI_utildefines.h" -#include "BLI_math.h" -#include "BLI_listbase.h" #include "BLI_ghash.h" +#include "BLI_listbase.h" +#include "BLI_math.h" #include "BLI_string.h" #include "BLI_string_utils.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" #include "BKE_movieclip.h" #include "BKE_tracking.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "IMB_moviecache.h" #include "tracking_private.h" diff --git a/source/blender/blenkernel/intern/undo_system.c b/source/blender/blenkernel/intern/undo_system.c index 30867cc15e9..6d484a7b702 100644 --- a/source/blender/blenkernel/intern/undo_system.c +++ b/source/blender/blenkernel/intern/undo_system.c @@ -24,10 +24,10 @@ #include "CLG_log.h" -#include "BLI_utildefines.h" -#include "BLI_sys_types.h" #include "BLI_listbase.h" #include "BLI_string.h" +#include "BLI_sys_types.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" diff --git a/source/blender/blenkernel/intern/unit.c b/source/blender/blenkernel/intern/unit.c index ac1b5e4ab0b..3f44c13ba19 100644 --- a/source/blender/blenkernel/intern/unit.c +++ b/source/blender/blenkernel/intern/unit.c @@ -18,16 +18,16 @@ * \ingroup bke */ -#include -#include +#include #include +#include +#include #include -#include -#include "BLI_sys_types.h" #include "BLI_math.h" #include "BLI_string.h" #include "BLI_string_utf8.h" +#include "BLI_sys_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/blenkernel/intern/volume.cc b/source/blender/blenkernel/intern/volume.cc index 6fb44e91388..b16fe3b7524 100644 --- a/source/blender/blenkernel/intern/volume.cc +++ b/source/blender/blenkernel/intern/volume.cc @@ -38,8 +38,8 @@ #include "BLI_utildefines.h" #include "BKE_animsys.h" -#include "BKE_idtype.h" #include "BKE_global.h" +#include "BKE_idtype.h" #include "BKE_lib_id.h" #include "BKE_lib_query.h" #include "BKE_lib_remap.h" diff --git a/source/blender/blenkernel/intern/workspace.c b/source/blender/blenkernel/intern/workspace.c index 8fff2e60594..66a3c2cdced 100644 --- a/source/blender/blenkernel/intern/workspace.c +++ b/source/blender/blenkernel/intern/workspace.c @@ -21,10 +21,10 @@ #include #include -#include "BLI_utildefines.h" +#include "BLI_listbase.h" #include "BLI_string.h" #include "BLI_string_utils.h" -#include "BLI_listbase.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" @@ -33,8 +33,8 @@ #include "BKE_idtype.h" #include "BKE_lib_id.h" #include "BKE_main.h" -#include "BKE_scene.h" #include "BKE_object.h" +#include "BKE_scene.h" #include "BKE_workspace.h" #include "DNA_object_types.h" diff --git a/source/blender/blenkernel/intern/world.c b/source/blender/blenkernel/intern/world.c index a3505869308..3492a35b242 100644 --- a/source/blender/blenkernel/intern/world.c +++ b/source/blender/blenkernel/intern/world.c @@ -21,19 +21,19 @@ * \ingroup bke */ -#include -#include #include +#include +#include #include "MEM_guardedalloc.h" -#include "DNA_world_types.h" +#include "DNA_defaults.h" #include "DNA_scene_types.h" #include "DNA_texture_types.h" -#include "DNA_defaults.h" +#include "DNA_world_types.h" -#include "BLI_utildefines.h" #include "BLI_listbase.h" +#include "BLI_utildefines.h" #include "BKE_animsys.h" #include "BKE_icons.h" diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c index 7e5d99617e4..16e56200131 100644 --- a/source/blender/blenkernel/intern/writeffmpeg.c +++ b/source/blender/blenkernel/intern/writeffmpeg.c @@ -20,8 +20,8 @@ */ #ifdef WITH_FFMPEG -# include # include +# include # include @@ -52,8 +52,8 @@ /* This needs to be included after BLI_math_base.h otherwise it will redefine some math defines * like M_SQRT1_2 leading to warnings with MSVC */ -# include # include +# include # include # include # include -- cgit v1.2.3