diff options
Diffstat (limited to 'source/blender/modifiers/intern')
46 files changed, 74 insertions, 74 deletions
diff --git a/source/blender/modifiers/intern/MOD_armature.c b/source/blender/modifiers/intern/MOD_armature.c index 38b66121cee..3e78662da6c 100644 --- a/source/blender/modifiers/intern/MOD_armature.c +++ b/source/blender/modifiers/intern/MOD_armature.c @@ -23,12 +23,12 @@ #include <string.h> -#include "BLI_utildefines.h" #include "BLI_listbase.h" +#include "BLI_utildefines.h" #include "DNA_armature_types.h" -#include "DNA_object_types.h" #include "DNA_mesh_types.h" +#include "DNA_object_types.h" #include "BKE_action.h" #include "BKE_editmesh.h" diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c index f8f8ea49676..ff5bf3d0ee4 100644 --- a/source/blender/modifiers/intern/MOD_array.c +++ b/source/blender/modifiers/intern/MOD_array.c @@ -35,12 +35,12 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BKE_displist.h" #include "BKE_curve.h" +#include "BKE_displist.h" #include "BKE_lib_id.h" #include "BKE_lib_query.h" -#include "BKE_modifier.h" #include "BKE_mesh.h" +#include "BKE_modifier.h" #include "BKE_object_deform.h" #include "MOD_util.h" diff --git a/source/blender/modifiers/intern/MOD_bevel.c b/source/blender/modifiers/intern/MOD_bevel.c index de08533753e..bd2f8a6dca3 100644 --- a/source/blender/modifiers/intern/MOD_bevel.c +++ b/source/blender/modifiers/intern/MOD_bevel.c @@ -27,11 +27,11 @@ #include "BLI_math.h" +#include "DNA_curveprofile_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_curveprofile_types.h" #include "BKE_deform.h" #include "BKE_mesh.h" @@ -39,9 +39,9 @@ #include "MOD_util.h" +#include "BKE_curveprofile.h" #include "bmesh.h" #include "bmesh_tools.h" -#include "BKE_curveprofile.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/modifiers/intern/MOD_build.c b/source/blender/modifiers/intern/MOD_build.c index e61f6877d09..3c1a5744b33 100644 --- a/source/blender/modifiers/intern/MOD_build.c +++ b/source/blender/modifiers/intern/MOD_build.c @@ -29,8 +29,8 @@ #include "BLI_math_vector.h" #include "BLI_rand.h" -#include "DNA_meshdata_types.h" #include "DNA_mesh_types.h" +#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/modifiers/intern/MOD_cloth.c b/source/blender/modifiers/intern/MOD_cloth.c index 63c1b6f1ef0..0cab6144de8 100644 --- a/source/blender/modifiers/intern/MOD_cloth.c +++ b/source/blender/modifiers/intern/MOD_cloth.c @@ -30,8 +30,8 @@ #include "DNA_cloth_types.h" #include "DNA_key_types.h" #include "DNA_mesh_types.h" -#include "DNA_scene_types.h" #include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/modifiers/intern/MOD_collision.c b/source/blender/modifiers/intern/MOD_collision.c index 2dec5963f3c..af468cb2d27 100644 --- a/source/blender/modifiers/intern/MOD_collision.c +++ b/source/blender/modifiers/intern/MOD_collision.c @@ -25,9 +25,9 @@ #include "BLI_math.h" -#include "DNA_object_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" +#include "DNA_object_types.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/modifiers/intern/MOD_correctivesmooth.c b/source/blender/modifiers/intern/MOD_correctivesmooth.c index d35873728db..4eea9092e10 100644 --- a/source/blender/modifiers/intern/MOD_correctivesmooth.c +++ b/source/blender/modifiers/intern/MOD_correctivesmooth.c @@ -27,17 +27,17 @@ #include "BLI_math.h" -#include "DNA_scene_types.h" +#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" -#include "DNA_mesh_types.h" +#include "DNA_scene_types.h" #include "MEM_guardedalloc.h" #include "BKE_deform.h" -#include "BKE_mesh.h" #include "BKE_editmesh.h" #include "BKE_lib_id.h" +#include "BKE_mesh.h" #include "MOD_modifiertypes.h" #include "MOD_util.h" diff --git a/source/blender/modifiers/intern/MOD_curve.c b/source/blender/modifiers/intern/MOD_curve.c index f1fa627df00..e287685a9e5 100644 --- a/source/blender/modifiers/intern/MOD_curve.c +++ b/source/blender/modifiers/intern/MOD_curve.c @@ -26,8 +26,8 @@ #include "BLI_utildefines.h" #include "DNA_mesh_types.h" -#include "DNA_scene_types.h" #include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BKE_editmesh.h" #include "BKE_lattice.h" diff --git a/source/blender/modifiers/intern/MOD_decimate.c b/source/blender/modifiers/intern/MOD_decimate.c index 8680b514fdc..cf07b5460e1 100644 --- a/source/blender/modifiers/intern/MOD_decimate.c +++ b/source/blender/modifiers/intern/MOD_decimate.c @@ -25,9 +25,9 @@ #include "BLI_math.h" -#include "DNA_object_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" +#include "DNA_object_types.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/modifiers/intern/MOD_displace.c b/source/blender/modifiers/intern/MOD_displace.c index 46a9d4e676f..a1b02e201d9 100644 --- a/source/blender/modifiers/intern/MOD_displace.c +++ b/source/blender/modifiers/intern/MOD_displace.c @@ -31,15 +31,15 @@ #include "DNA_object_types.h" #include "BKE_customdata.h" +#include "BKE_deform.h" #include "BKE_editmesh.h" +#include "BKE_image.h" #include "BKE_lib_id.h" #include "BKE_lib_query.h" -#include "BKE_image.h" #include "BKE_mesh.h" #include "BKE_modifier.h" -#include "BKE_texture.h" -#include "BKE_deform.h" #include "BKE_object.h" +#include "BKE_texture.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/modifiers/intern/MOD_dynamicpaint.c b/source/blender/modifiers/intern/MOD_dynamicpaint.c index dc9b2f763e0..457f47bf025 100644 --- a/source/blender/modifiers/intern/MOD_dynamicpaint.c +++ b/source/blender/modifiers/intern/MOD_dynamicpaint.c @@ -23,10 +23,10 @@ #include "BLI_utildefines.h" #include "DNA_dynamicpaint_types.h" -#include "DNA_object_types.h" +#include "DNA_mesh_types.h" #include "DNA_object_force_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_mesh_types.h" #include "BKE_dynamicpaint.h" #include "BKE_layer.h" diff --git a/source/blender/modifiers/intern/MOD_explode.c b/source/blender/modifiers/intern/MOD_explode.c index e900b304c6f..d380747eb31 100644 --- a/source/blender/modifiers/intern/MOD_explode.c +++ b/source/blender/modifiers/intern/MOD_explode.c @@ -28,10 +28,10 @@ #include "BLI_math.h" #include "BLI_rand.h" +#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "DNA_scene_types.h" #include "DNA_object_types.h" -#include "DNA_mesh_types.h" +#include "DNA_scene_types.h" #include "BKE_deform.h" #include "BKE_lattice.h" diff --git a/source/blender/modifiers/intern/MOD_fluid.c b/source/blender/modifiers/intern/MOD_fluid.c index 16dfe5ffc40..1c2f0a413a7 100644 --- a/source/blender/modifiers/intern/MOD_fluid.c +++ b/source/blender/modifiers/intern/MOD_fluid.c @@ -28,16 +28,16 @@ #include "BLI_utildefines.h" #include "DNA_collection_types.h" -#include "DNA_object_types.h" -#include "DNA_scene_types.h" #include "DNA_fluid_types.h" -#include "DNA_object_force_types.h" #include "DNA_mesh_types.h" +#include "DNA_object_force_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" +#include "BKE_fluid.h" #include "BKE_layer.h" #include "BKE_lib_query.h" #include "BKE_modifier.h" -#include "BKE_fluid.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" diff --git a/source/blender/modifiers/intern/MOD_hook.c b/source/blender/modifiers/intern/MOD_hook.c index 78d29edfd98..1ae2c5e4424 100644 --- a/source/blender/modifiers/intern/MOD_hook.c +++ b/source/blender/modifiers/intern/MOD_hook.c @@ -30,13 +30,13 @@ #include "DNA_object_types.h" #include "BKE_action.h" +#include "BKE_colortools.h" +#include "BKE_deform.h" #include "BKE_editmesh.h" #include "BKE_lib_id.h" #include "BKE_lib_query.h" #include "BKE_mesh.h" #include "BKE_modifier.h" -#include "BKE_deform.h" -#include "BKE_colortools.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/modifiers/intern/MOD_mask.cc b/source/blender/modifiers/intern/MOD_mask.cc index 0b2981fca36..3bdb5a3fd54 100644 --- a/source/blender/modifiers/intern/MOD_mask.cc +++ b/source/blender/modifiers/intern/MOD_mask.cc @@ -25,8 +25,8 @@ #include "BLI_utildefines.h" -#include "BLI_listbase.h" #include "BLI_ghash.h" +#include "BLI_listbase.h" #include "DNA_armature_types.h" #include "DNA_mesh_types.h" @@ -36,10 +36,10 @@ #include "BKE_action.h" /* BKE_pose_channel_find_name */ #include "BKE_customdata.h" +#include "BKE_deform.h" #include "BKE_lib_query.h" #include "BKE_mesh.h" #include "BKE_modifier.h" -#include "BKE_deform.h" #include "DEG_depsgraph_build.h" #include "DEG_depsgraph_query.h" @@ -47,8 +47,8 @@ #include "MOD_modifiertypes.h" #include "BLI_array_cxx.h" -#include "BLI_vector.h" #include "BLI_listbase_wrapper.h" +#include "BLI_vector.h" using BLI::Array; using BLI::ArrayRef; diff --git a/source/blender/modifiers/intern/MOD_meshcache.c b/source/blender/modifiers/intern/MOD_meshcache.c index e01f07584ee..c2cbddf806c 100644 --- a/source/blender/modifiers/intern/MOD_meshcache.c +++ b/source/blender/modifiers/intern/MOD_meshcache.c @@ -26,10 +26,10 @@ #include "BLI_path_util.h" #include "BLI_string.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 "BKE_main.h" #include "BKE_mesh.h" diff --git a/source/blender/modifiers/intern/MOD_meshcache_mdd.c b/source/blender/modifiers/intern/MOD_meshcache_mdd.c index f3cb1469d8b..60376f61708 100644 --- a/source/blender/modifiers/intern/MOD_meshcache_mdd.c +++ b/source/blender/modifiers/intern/MOD_meshcache_mdd.c @@ -18,9 +18,9 @@ * \ingroup modifiers */ +#include <errno.h> #include <stdio.h> #include <string.h> -#include <errno.h> #include "BLI_utildefines.h" diff --git a/source/blender/modifiers/intern/MOD_meshcache_pc2.c b/source/blender/modifiers/intern/MOD_meshcache_pc2.c index 8d4b4a6dfdd..60011458c67 100644 --- a/source/blender/modifiers/intern/MOD_meshcache_pc2.c +++ b/source/blender/modifiers/intern/MOD_meshcache_pc2.c @@ -18,9 +18,9 @@ * \ingroup modifiers */ +#include <errno.h> #include <stdio.h> #include <string.h> -#include <errno.h> #include "BLI_utildefines.h" diff --git a/source/blender/modifiers/intern/MOD_meshdeform.c b/source/blender/modifiers/intern/MOD_meshdeform.c index 28299d78371..7125d0df3a1 100644 --- a/source/blender/modifiers/intern/MOD_meshdeform.c +++ b/source/blender/modifiers/intern/MOD_meshdeform.c @@ -31,14 +31,14 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" +#include "BKE_deform.h" +#include "BKE_editmesh.h" #include "BKE_global.h" #include "BKE_lib_id.h" #include "BKE_lib_query.h" #include "BKE_mesh.h" #include "BKE_mesh_runtime.h" #include "BKE_modifier.h" -#include "BKE_deform.h" -#include "BKE_editmesh.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/modifiers/intern/MOD_meshsequencecache.c b/source/blender/modifiers/intern/MOD_meshsequencecache.c index e0c81b005fd..7357f18eb6a 100644 --- a/source/blender/modifiers/intern/MOD_meshsequencecache.c +++ b/source/blender/modifiers/intern/MOD_meshsequencecache.c @@ -20,8 +20,8 @@ #include <string.h> -#include "BLI_utildefines.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "DNA_cachefile_types.h" #include "DNA_mesh_types.h" diff --git a/source/blender/modifiers/intern/MOD_mirror.c b/source/blender/modifiers/intern/MOD_mirror.c index 45a2f619369..3b3dfa2bda2 100644 --- a/source/blender/modifiers/intern/MOD_mirror.c +++ b/source/blender/modifiers/intern/MOD_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/modifiers/intern/MOD_multires.c b/source/blender/modifiers/intern/MOD_multires.c index 2068c747f4e..742d100ac44 100644 --- a/source/blender/modifiers/intern/MOD_multires.c +++ b/source/blender/modifiers/intern/MOD_multires.c @@ -33,8 +33,8 @@ #include "BKE_cdderivedmesh.h" #include "BKE_mesh.h" -#include "BKE_multires.h" #include "BKE_modifier.h" +#include "BKE_multires.h" #include "BKE_paint.h" #include "BKE_subdiv.h" #include "BKE_subdiv_ccg.h" diff --git a/source/blender/modifiers/intern/MOD_normal_edit.c b/source/blender/modifiers/intern/MOD_normal_edit.c index ace0c1b5eaf..0b101b26906 100644 --- a/source/blender/modifiers/intern/MOD_normal_edit.c +++ b/source/blender/modifiers/intern/MOD_normal_edit.c @@ -27,14 +27,14 @@ #include "BLI_bitmap.h" #include "BLI_math.h" -#include "DNA_object_types.h" -#include "DNA_meshdata_types.h" #include "DNA_mesh_types.h" +#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_deform.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/modifiers/intern/MOD_ocean.c b/source/blender/modifiers/intern/MOD_ocean.c index fec04e9916d..fddfc74f267 100644 --- a/source/blender/modifiers/intern/MOD_ocean.c +++ b/source/blender/modifiers/intern/MOD_ocean.c @@ -28,10 +28,10 @@ #include "BLI_task.h" #include "DNA_customdata_types.h" -#include "DNA_object_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 "BKE_lib_id.h" diff --git a/source/blender/modifiers/intern/MOD_particleinstance.c b/source/blender/modifiers/intern/MOD_particleinstance.c index d4a8f50f03f..8a4468ec91e 100644 --- a/source/blender/modifiers/intern/MOD_particleinstance.c +++ b/source/blender/modifiers/intern/MOD_particleinstance.c @@ -25,8 +25,8 @@ #include "BLI_utildefines.h" -#include "BLI_math.h" #include "BLI_listbase.h" +#include "BLI_math.h" #include "BLI_rand.h" #include "BLI_string.h" diff --git a/source/blender/modifiers/intern/MOD_particlesystem.c b/source/blender/modifiers/intern/MOD_particlesystem.c index 462f9a428f3..e6229e27e4b 100644 --- a/source/blender/modifiers/intern/MOD_particlesystem.c +++ b/source/blender/modifiers/intern/MOD_particlesystem.c @@ -29,8 +29,8 @@ #include "DNA_mesh_types.h" #include "BKE_editmesh.h" -#include "BKE_mesh.h" #include "BKE_lib_id.h" +#include "BKE_mesh.h" #include "BKE_modifier.h" #include "BKE_particle.h" diff --git a/source/blender/modifiers/intern/MOD_remesh.c b/source/blender/modifiers/intern/MOD_remesh.c index df84f3db55c..3300cda947c 100644 --- a/source/blender/modifiers/intern/MOD_remesh.c +++ b/source/blender/modifiers/intern/MOD_remesh.c @@ -26,10 +26,10 @@ #include "BLI_math_base.h" +#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" #include "DNA_object_types.h" -#include "DNA_mesh_types.h" #include "MOD_modifiertypes.h" diff --git a/source/blender/modifiers/intern/MOD_screw.c b/source/blender/modifiers/intern/MOD_screw.c index 460fd906986..8921ddb894f 100644 --- a/source/blender/modifiers/intern/MOD_screw.c +++ b/source/blender/modifiers/intern/MOD_screw.c @@ -26,8 +26,8 @@ #include "BLI_utildefines.h" -#include "BLI_math.h" #include "BLI_alloca.h" +#include "BLI_math.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" @@ -39,8 +39,8 @@ #include "DEG_depsgraph_build.h" #include "DEG_depsgraph_query.h" -#include "MOD_modifiertypes.h" #include "MEM_guardedalloc.h" +#include "MOD_modifiertypes.h" #include "BLI_strict_flags.h" diff --git a/source/blender/modifiers/intern/MOD_shapekey.c b/source/blender/modifiers/intern/MOD_shapekey.c index 69db6f5565d..25f702bf696 100644 --- a/source/blender/modifiers/intern/MOD_shapekey.c +++ b/source/blender/modifiers/intern/MOD_shapekey.c @@ -25,8 +25,8 @@ #include "BLI_math.h" -#include "DNA_mesh_types.h" #include "DNA_key_types.h" +#include "DNA_mesh_types.h" #include "BKE_key.h" #include "BKE_particle.h" diff --git a/source/blender/modifiers/intern/MOD_simpledeform.c b/source/blender/modifiers/intern/MOD_simpledeform.c index f38a50bd672..65ea6b95824 100644 --- a/source/blender/modifiers/intern/MOD_simpledeform.c +++ b/source/blender/modifiers/intern/MOD_simpledeform.c @@ -29,12 +29,12 @@ #include "DNA_meshdata_types.h" #include "DNA_object_types.h" +#include "BKE_deform.h" #include "BKE_editmesh.h" -#include "BKE_mesh.h" #include "BKE_lib_id.h" #include "BKE_lib_query.h" +#include "BKE_mesh.h" #include "BKE_modifier.h" -#include "BKE_deform.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/modifiers/intern/MOD_skin.c b/source/blender/modifiers/intern/MOD_skin.c index b22874eb0bc..ec7c2b5b1a4 100644 --- a/source/blender/modifiers/intern/MOD_skin.c +++ b/source/blender/modifiers/intern/MOD_skin.c @@ -63,8 +63,8 @@ #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "DNA_object_types.h" #include "DNA_modifier_types.h" +#include "DNA_object_types.h" #include "BKE_deform.h" #include "BKE_lib_id.h" diff --git a/source/blender/modifiers/intern/MOD_smooth.c b/source/blender/modifiers/intern/MOD_smooth.c index 1a08083aa2f..2a0376fd291 100644 --- a/source/blender/modifiers/intern/MOD_smooth.c +++ b/source/blender/modifiers/intern/MOD_smooth.c @@ -30,11 +30,11 @@ #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" +#include "BKE_deform.h" #include "BKE_editmesh.h" #include "BKE_lib_id.h" #include "BKE_mesh.h" #include "BKE_particle.h" -#include "BKE_deform.h" #include "MOD_modifiertypes.h" #include "MOD_util.h" diff --git a/source/blender/modifiers/intern/MOD_softbody.c b/source/blender/modifiers/intern/MOD_softbody.c index af6de8447ec..679fdb634f4 100644 --- a/source/blender/modifiers/intern/MOD_softbody.c +++ b/source/blender/modifiers/intern/MOD_softbody.c @@ -25,9 +25,9 @@ #include "BLI_utildefines.h" -#include "DNA_scene_types.h" #include "DNA_mesh_types.h" #include "DNA_object_force_types.h" +#include "DNA_scene_types.h" #include "BKE_layer.h" #include "BKE_particle.h" diff --git a/source/blender/modifiers/intern/MOD_solidify_extrude.c b/source/blender/modifiers/intern/MOD_solidify_extrude.c index 0be674ea2e8..8febf78fef5 100644 --- a/source/blender/modifiers/intern/MOD_solidify_extrude.c +++ b/source/blender/modifiers/intern/MOD_solidify_extrude.c @@ -29,13 +29,13 @@ #include "MEM_guardedalloc.h" +#include "BKE_deform.h" #include "BKE_mesh.h" #include "BKE_particle.h" -#include "BKE_deform.h" #include "MOD_modifiertypes.h" -#include "MOD_util.h" #include "MOD_solidify_util.h" /* own include */ +#include "MOD_util.h" #ifdef __GNUC__ # pragma GCC diagnostic error "-Wsign-conversion" diff --git a/source/blender/modifiers/intern/MOD_solidify_nonmanifold.c b/source/blender/modifiers/intern/MOD_solidify_nonmanifold.c index 7dea4d2ccd7..23053adfd5a 100644 --- a/source/blender/modifiers/intern/MOD_solidify_nonmanifold.c +++ b/source/blender/modifiers/intern/MOD_solidify_nonmanifold.c @@ -27,13 +27,13 @@ #include "MEM_guardedalloc.h" +#include "BKE_deform.h" #include "BKE_mesh.h" #include "BKE_particle.h" -#include "BKE_deform.h" #include "MOD_modifiertypes.h" -#include "MOD_util.h" #include "MOD_solidify_util.h" /* Own include. */ +#include "MOD_util.h" #ifdef __GNUC__ # pragma GCC diagnostic error "-Wsign-conversion" diff --git a/source/blender/modifiers/intern/MOD_subsurf.c b/source/blender/modifiers/intern/MOD_subsurf.c index 5fcd9622c5d..56180564be2 100644 --- a/source/blender/modifiers/intern/MOD_subsurf.c +++ b/source/blender/modifiers/intern/MOD_subsurf.c @@ -27,9 +27,9 @@ #include "BLI_utildefines.h" +#include "DNA_mesh_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_mesh_types.h" #include "BKE_scene.h" #include "BKE_subdiv.h" diff --git a/source/blender/modifiers/intern/MOD_surface.c b/source/blender/modifiers/intern/MOD_surface.c index a9c91e6188d..0e318e9b092 100644 --- a/source/blender/modifiers/intern/MOD_surface.c +++ b/source/blender/modifiers/intern/MOD_surface.c @@ -25,10 +25,10 @@ #include "BLI_math.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 "BKE_bvhutils.h" #include "BKE_lib_id.h" diff --git a/source/blender/modifiers/intern/MOD_surfacedeform.c b/source/blender/modifiers/intern/MOD_surfacedeform.c index 743c2227981..57e7e2fa98b 100644 --- a/source/blender/modifiers/intern/MOD_surfacedeform.c +++ b/source/blender/modifiers/intern/MOD_surfacedeform.c @@ -30,10 +30,10 @@ #include "DNA_scene_types.h" #include "BKE_bvhutils.h" -#include "BKE_mesh_runtime.h" #include "BKE_editmesh.h" #include "BKE_lib_id.h" #include "BKE_lib_query.h" +#include "BKE_mesh_runtime.h" #include "BKE_modifier.h" #include "DEG_depsgraph.h" diff --git a/source/blender/modifiers/intern/MOD_triangulate.c b/source/blender/modifiers/intern/MOD_triangulate.c index 94613353373..1e6bc2e1819 100644 --- a/source/blender/modifiers/intern/MOD_triangulate.c +++ b/source/blender/modifiers/intern/MOD_triangulate.c @@ -26,8 +26,8 @@ #include "DNA_meshdata_types.h" #include "DNA_object_types.h" -#include "BKE_modifier.h" #include "BKE_mesh.h" +#include "BKE_modifier.h" #include "bmesh.h" #include "bmesh_tools.h" diff --git a/source/blender/modifiers/intern/MOD_util.c b/source/blender/modifiers/intern/MOD_util.c index d234570a974..c0014a2c0cd 100644 --- a/source/blender/modifiers/intern/MOD_util.c +++ b/source/blender/modifiers/intern/MOD_util.c @@ -26,12 +26,12 @@ #include "BLI_utildefines.h" #include "BLI_bitmap.h" -#include "BLI_math_vector.h" #include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "DNA_image_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_scene_types.h" @@ -49,8 +49,8 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" -#include "MOD_util.h" #include "MOD_modifiertypes.h" +#include "MOD_util.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/modifiers/intern/MOD_uvproject.c b/source/blender/modifiers/intern/MOD_uvproject.c index b87bfa7190f..242f31b6434 100644 --- a/source/blender/modifiers/intern/MOD_uvproject.c +++ b/source/blender/modifiers/intern/MOD_uvproject.c @@ -28,9 +28,9 @@ #include "BLI_math.h" #include "BLI_uvproject.h" +#include "DNA_camera_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "DNA_camera_types.h" #include "DNA_object_types.h" #include "BKE_camera.h" diff --git a/source/blender/modifiers/intern/MOD_warp.c b/source/blender/modifiers/intern/MOD_warp.c index 9d037455579..4a98afbb91c 100644 --- a/source/blender/modifiers/intern/MOD_warp.c +++ b/source/blender/modifiers/intern/MOD_warp.c @@ -30,14 +30,14 @@ #include "DNA_meshdata_types.h" #include "DNA_object_types.h" +#include "BKE_colortools.h" +#include "BKE_deform.h" #include "BKE_editmesh.h" #include "BKE_lib_id.h" #include "BKE_lib_query.h" #include "BKE_mesh.h" #include "BKE_modifier.h" -#include "BKE_deform.h" #include "BKE_texture.h" -#include "BKE_colortools.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/modifiers/intern/MOD_weightvgedit.c b/source/blender/modifiers/intern/MOD_weightvgedit.c index f914d05dbcd..6acbbefe745 100644 --- a/source/blender/modifiers/intern/MOD_weightvgedit.c +++ b/source/blender/modifiers/intern/MOD_weightvgedit.c @@ -44,8 +44,8 @@ #include "MEM_guardedalloc.h" -#include "MOD_weightvg_util.h" #include "MOD_modifiertypes.h" +#include "MOD_weightvg_util.h" /************************************** * Modifiers functions. * diff --git a/source/blender/modifiers/intern/MOD_weightvgmix.c b/source/blender/modifiers/intern/MOD_weightvgmix.c index 4aaa69912b2..4984853d41e 100644 --- a/source/blender/modifiers/intern/MOD_weightvgmix.c +++ b/source/blender/modifiers/intern/MOD_weightvgmix.c @@ -42,8 +42,8 @@ #include "MEM_guardedalloc.h" -#include "MOD_weightvg_util.h" #include "MOD_modifiertypes.h" +#include "MOD_weightvg_util.h" /** * This mixes the old weight with the new weight factor. diff --git a/source/blender/modifiers/intern/MOD_weightvgproximity.c b/source/blender/modifiers/intern/MOD_weightvgproximity.c index 9403c2a837b..e2e8e732311 100644 --- a/source/blender/modifiers/intern/MOD_weightvgproximity.c +++ b/source/blender/modifiers/intern/MOD_weightvgproximity.c @@ -49,9 +49,9 @@ #include "MEM_guardedalloc.h" -#include "MOD_weightvg_util.h" #include "MOD_modifiertypes.h" #include "MOD_util.h" +#include "MOD_weightvg_util.h" //#define USE_TIMEIT diff --git a/source/blender/modifiers/intern/MOD_weld.c b/source/blender/modifiers/intern/MOD_weld.c index 609c9c33d24..5d56152e0ff 100644 --- a/source/blender/modifiers/intern/MOD_weld.c +++ b/source/blender/modifiers/intern/MOD_weld.c @@ -40,10 +40,10 @@ #include "DNA_modifier_types.h" #include "DNA_object_types.h" -#include "BKE_deform.h" #include "BKE_bvhutils.h" -#include "BKE_modifier.h" +#include "BKE_deform.h" #include "BKE_mesh.h" +#include "BKE_modifier.h" #include "DEG_depsgraph.h" |