From e31f0fad9744c8133ef84251c18e89c1e3e5d04e Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Mon, 25 Feb 2019 11:39:14 +0100 Subject: Cleanup: order of modifiers' headers includes. BLI should always comes first, before DNA, BKE etc. And `BLI_utildefines.h` should come before any other BLI (since it's some sort of system include really, among other things...). Thisi should help to reduce the noise in patches when adding stuff like uint64_t members to DNA structs... ;) --- source/blender/modifiers/intern/MOD_normal_edit.c | 9 +++++---- source/blender/modifiers/intern/MOD_ocean.c | 11 ++++++----- source/blender/modifiers/intern/MOD_particleinstance.c | 9 +++++---- source/blender/modifiers/intern/MOD_particlesystem.c | 5 ++--- source/blender/modifiers/intern/MOD_remesh.c | 3 ++- source/blender/modifiers/intern/MOD_screw.c | 9 +++++---- source/blender/modifiers/intern/MOD_shapekey.c | 4 ++-- source/blender/modifiers/intern/MOD_shrinkwrap.c | 4 ++-- source/blender/modifiers/intern/MOD_simpledeform.c | 7 ++++--- source/blender/modifiers/intern/MOD_skin.c | 13 +++++++------ source/blender/modifiers/intern/MOD_smoke.c | 4 ++-- source/blender/modifiers/intern/MOD_smooth.c | 9 +++++---- source/blender/modifiers/intern/MOD_softbody.c | 4 ++-- source/blender/modifiers/intern/MOD_solidify.c | 11 ++++++----- source/blender/modifiers/intern/MOD_subsurf.c | 4 ++-- source/blender/modifiers/intern/MOD_surface.c | 7 ++++--- source/blender/modifiers/intern/MOD_surfacedeform.c | 8 ++++---- source/blender/modifiers/intern/MOD_triangulate.c | 4 ++-- source/blender/modifiers/intern/MOD_util.c | 11 ++++++----- source/blender/modifiers/intern/MOD_uvproject.c | 10 +++++----- source/blender/modifiers/intern/MOD_uvwarp.c | 9 +++++---- source/blender/modifiers/intern/MOD_warp.c | 7 ++++--- source/blender/modifiers/intern/MOD_wave.c | 5 ++--- source/blender/modifiers/intern/MOD_weighted_normal.c | 6 +++--- source/blender/modifiers/intern/MOD_weightvg_util.c | 3 ++- source/blender/modifiers/intern/MOD_weightvgedit.c | 1 + source/blender/modifiers/intern/MOD_weightvgmix.c | 3 ++- source/blender/modifiers/intern/MOD_weightvgproximity.c | 1 + source/blender/modifiers/intern/MOD_wireframe.c | 4 ++-- 29 files changed, 100 insertions(+), 85 deletions(-) (limited to 'source/blender/modifiers') diff --git a/source/blender/modifiers/intern/MOD_normal_edit.c b/source/blender/modifiers/intern/MOD_normal_edit.c index 9421c61f14f..8da49fb6632 100644 --- a/source/blender/modifiers/intern/MOD_normal_edit.c +++ b/source/blender/modifiers/intern/MOD_normal_edit.c @@ -22,14 +22,15 @@ #include "MEM_guardedalloc.h" +#include "BLI_utildefines.h" + +#include "BLI_bitmap.h" +#include "BLI_math.h" + #include "DNA_object_types.h" #include "DNA_meshdata_types.h" #include "DNA_mesh_types.h" -#include "BLI_math.h" -#include "BLI_utildefines.h" -#include "BLI_bitmap.h" - #include "BKE_library.h" #include "BKE_library_query.h" #include "BKE_mesh.h" diff --git a/source/blender/modifiers/intern/MOD_ocean.c b/source/blender/modifiers/intern/MOD_ocean.c index 02358f47f7b..cf8e51d4694 100644 --- a/source/blender/modifiers/intern/MOD_ocean.c +++ b/source/blender/modifiers/intern/MOD_ocean.c @@ -21,6 +21,12 @@ * \ingroup modifiers */ +#include "BLI_utildefines.h" + +#include "BLI_math.h" +#include "BLI_math_inline.h" +#include "BLI_task.h" + #include "DNA_customdata_types.h" #include "DNA_object_types.h" #include "DNA_mesh_types.h" @@ -28,11 +34,6 @@ #include "DNA_modifier_types.h" #include "DNA_scene_types.h" -#include "BLI_math.h" -#include "BLI_math_inline.h" -#include "BLI_task.h" -#include "BLI_utildefines.h" - #include "BKE_library.h" #include "BKE_mesh.h" #include "BKE_modifier.h" diff --git a/source/blender/modifiers/intern/MOD_particleinstance.c b/source/blender/modifiers/intern/MOD_particleinstance.c index c832d736585..d219375b187 100644 --- a/source/blender/modifiers/intern/MOD_particleinstance.c +++ b/source/blender/modifiers/intern/MOD_particleinstance.c @@ -21,16 +21,17 @@ * \ingroup modifiers */ -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" - #include "MEM_guardedalloc.h" +#include "BLI_utildefines.h" + #include "BLI_math.h" #include "BLI_listbase.h" #include "BLI_rand.h" #include "BLI_string.h" -#include "BLI_utildefines.h" + +#include "DNA_mesh_types.h" +#include "DNA_meshdata_types.h" #include "BKE_effect.h" #include "BKE_lattice.h" diff --git a/source/blender/modifiers/intern/MOD_particlesystem.c b/source/blender/modifiers/intern/MOD_particlesystem.c index a9b4aa87ad2..2360d3e3713 100644 --- a/source/blender/modifiers/intern/MOD_particlesystem.c +++ b/source/blender/modifiers/intern/MOD_particlesystem.c @@ -24,11 +24,10 @@ #include -#include "DNA_material_types.h" -#include "DNA_mesh_types.h" - #include "BLI_utildefines.h" +#include "DNA_material_types.h" +#include "DNA_mesh_types.h" #include "BKE_editmesh.h" #include "BKE_mesh.h" diff --git a/source/blender/modifiers/intern/MOD_remesh.c b/source/blender/modifiers/intern/MOD_remesh.c index 57e1d823111..2ff82d863df 100644 --- a/source/blender/modifiers/intern/MOD_remesh.c +++ b/source/blender/modifiers/intern/MOD_remesh.c @@ -22,9 +22,10 @@ #include "MEM_guardedalloc.h" -#include "BLI_math_base.h" #include "BLI_utildefines.h" +#include "BLI_math_base.h" + #include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" #include "DNA_object_types.h" diff --git a/source/blender/modifiers/intern/MOD_screw.c b/source/blender/modifiers/intern/MOD_screw.c index 3baff86d063..837b4d3d532 100644 --- a/source/blender/modifiers/intern/MOD_screw.c +++ b/source/blender/modifiers/intern/MOD_screw.c @@ -25,13 +25,14 @@ /* Screw modifier: revolves the edges about an axis */ #include -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" -#include "DNA_object_types.h" +#include "BLI_utildefines.h" #include "BLI_math.h" #include "BLI_alloca.h" -#include "BLI_utildefines.h" + +#include "DNA_mesh_types.h" +#include "DNA_meshdata_types.h" +#include "DNA_object_types.h" #include "BKE_library_query.h" #include "BKE_mesh.h" diff --git a/source/blender/modifiers/intern/MOD_shapekey.c b/source/blender/modifiers/intern/MOD_shapekey.c index d079258549a..3530ca21d34 100644 --- a/source/blender/modifiers/intern/MOD_shapekey.c +++ b/source/blender/modifiers/intern/MOD_shapekey.c @@ -21,13 +21,13 @@ * \ingroup modifiers */ +#include "BLI_utildefines.h" + #include "BLI_math.h" #include "DNA_mesh_types.h" #include "DNA_key_types.h" -#include "BLI_utildefines.h" - #include "BKE_key.h" #include "BKE_particle.h" diff --git a/source/blender/modifiers/intern/MOD_shrinkwrap.c b/source/blender/modifiers/intern/MOD_shrinkwrap.c index eb4d044544c..4af838df02a 100644 --- a/source/blender/modifiers/intern/MOD_shrinkwrap.c +++ b/source/blender/modifiers/intern/MOD_shrinkwrap.c @@ -24,11 +24,11 @@ #include +#include "BLI_utildefines.h" + #include "DNA_mesh_types.h" #include "DNA_object_types.h" -#include "BLI_utildefines.h" - #include "BKE_editmesh.h" #include "BKE_library.h" #include "BKE_library_query.h" diff --git a/source/blender/modifiers/intern/MOD_simpledeform.c b/source/blender/modifiers/intern/MOD_simpledeform.c index f2628acc00a..f53f320d93f 100644 --- a/source/blender/modifiers/intern/MOD_simpledeform.c +++ b/source/blender/modifiers/intern/MOD_simpledeform.c @@ -21,13 +21,14 @@ * \ingroup modifiers */ +#include "BLI_utildefines.h" + +#include "BLI_math.h" + #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" -#include "BLI_math.h" -#include "BLI_utildefines.h" - #include "BKE_editmesh.h" #include "BKE_mesh.h" #include "BKE_library.h" diff --git a/source/blender/modifiers/intern/MOD_skin.c b/source/blender/modifiers/intern/MOD_skin.c index ce52ac4f3de..75c485b879f 100644 --- a/source/blender/modifiers/intern/MOD_skin.c +++ b/source/blender/modifiers/intern/MOD_skin.c @@ -52,17 +52,18 @@ #include "MEM_guardedalloc.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" -#include "DNA_object_types.h" -#include "DNA_modifier_types.h" - #include "BLI_utildefines.h" + #include "BLI_array.h" +#include "BLI_bitmap.h" #include "BLI_heap_simple.h" #include "BLI_math.h" #include "BLI_stack.h" -#include "BLI_bitmap.h" + +#include "DNA_mesh_types.h" +#include "DNA_meshdata_types.h" +#include "DNA_object_types.h" +#include "DNA_modifier_types.h" #include "BKE_deform.h" #include "BKE_library.h" diff --git a/source/blender/modifiers/intern/MOD_smoke.c b/source/blender/modifiers/intern/MOD_smoke.c index 8345bfd656f..5269d651c6d 100644 --- a/source/blender/modifiers/intern/MOD_smoke.c +++ b/source/blender/modifiers/intern/MOD_smoke.c @@ -26,6 +26,8 @@ #include "MEM_guardedalloc.h" +#include "BLI_utildefines.h" + #include "DNA_collection_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" @@ -33,8 +35,6 @@ #include "DNA_object_force_types.h" #include "DNA_mesh_types.h" -#include "BLI_utildefines.h" - #include "BKE_cdderivedmesh.h" #include "BKE_layer.h" #include "BKE_library_query.h" diff --git a/source/blender/modifiers/intern/MOD_smooth.c b/source/blender/modifiers/intern/MOD_smooth.c index 4def5f6f5b2..65d93f0c608 100644 --- a/source/blender/modifiers/intern/MOD_smooth.c +++ b/source/blender/modifiers/intern/MOD_smooth.c @@ -22,13 +22,14 @@ */ -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" +#include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_utildefines.h" -#include "MEM_guardedalloc.h" +#include "BLI_math.h" + +#include "DNA_mesh_types.h" +#include "DNA_meshdata_types.h" #include "BKE_editmesh.h" #include "BKE_library.h" diff --git a/source/blender/modifiers/intern/MOD_softbody.c b/source/blender/modifiers/intern/MOD_softbody.c index 1d6afd45fc4..868b42bc241 100644 --- a/source/blender/modifiers/intern/MOD_softbody.c +++ b/source/blender/modifiers/intern/MOD_softbody.c @@ -23,12 +23,12 @@ #include +#include "BLI_utildefines.h" + #include "DNA_scene_types.h" #include "DNA_mesh_types.h" #include "DNA_object_force_types.h" -#include "BLI_utildefines.h" - #include "BKE_layer.h" #include "BKE_particle.h" #include "BKE_softbody.h" diff --git a/source/blender/modifiers/intern/MOD_solidify.c b/source/blender/modifiers/intern/MOD_solidify.c index d6006d9e012..45fd4f2650e 100644 --- a/source/blender/modifiers/intern/MOD_solidify.c +++ b/source/blender/modifiers/intern/MOD_solidify.c @@ -21,16 +21,17 @@ * \ingroup modifiers */ +#include "BLI_utildefines.h" + +#include "BLI_bitmap.h" +#include "BLI_math.h" +#include "BLI_utildefines_stack.h" + #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" -#include "BLI_utildefines_stack.h" -#include "BLI_bitmap.h" -#include "BLI_math.h" - #include "BKE_mesh.h" #include "BKE_particle.h" #include "BKE_deform.h" diff --git a/source/blender/modifiers/intern/MOD_subsurf.c b/source/blender/modifiers/intern/MOD_subsurf.c index d079d532938..1899faa3583 100644 --- a/source/blender/modifiers/intern/MOD_subsurf.c +++ b/source/blender/modifiers/intern/MOD_subsurf.c @@ -24,12 +24,12 @@ #include +#include "BLI_utildefines.h" + #include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_mesh_types.h" -#include "BLI_utildefines.h" - #include "BKE_cdderivedmesh.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 17a7cac8440..ee3c99bef85 100644 --- a/source/blender/modifiers/intern/MOD_surface.c +++ b/source/blender/modifiers/intern/MOD_surface.c @@ -22,6 +22,10 @@ */ +#include "BLI_utildefines.h" + +#include "BLI_math.h" + #include "DNA_scene_types.h" #include "DNA_object_types.h" #include "DNA_mesh_types.h" @@ -34,9 +38,6 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" -#include "BLI_math.h" -#include "BLI_utildefines.h" - #include "MOD_modifiertypes.h" #include "MOD_util.h" diff --git a/source/blender/modifiers/intern/MOD_surfacedeform.c b/source/blender/modifiers/intern/MOD_surfacedeform.c index 440ae7b537b..d1e5a3e31f0 100644 --- a/source/blender/modifiers/intern/MOD_surfacedeform.c +++ b/source/blender/modifiers/intern/MOD_surfacedeform.c @@ -20,15 +20,15 @@ * \ingroup modifiers */ +#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_task.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_math_geom.h" -#include "BLI_task.h" - #include "BKE_bvhutils.h" #include "BKE_mesh_runtime.h" #include "BKE_editmesh.h" diff --git a/source/blender/modifiers/intern/MOD_triangulate.c b/source/blender/modifiers/intern/MOD_triangulate.c index a916d21956f..2baaff9a676 100644 --- a/source/blender/modifiers/intern/MOD_triangulate.c +++ b/source/blender/modifiers/intern/MOD_triangulate.c @@ -18,12 +18,12 @@ * \ingroup modifiers */ +#include "BLI_utildefines.h" + #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" -#include "BLI_utildefines.h" - #include "BKE_modifier.h" #include "BKE_mesh.h" diff --git a/source/blender/modifiers/intern/MOD_util.c b/source/blender/modifiers/intern/MOD_util.c index 3258931c925..2d6e995403e 100644 --- a/source/blender/modifiers/intern/MOD_util.c +++ b/source/blender/modifiers/intern/MOD_util.c @@ -24,6 +24,12 @@ #include +#include "BLI_utildefines.h" + +#include "BLI_bitmap.h" +#include "BLI_math_vector.h" +#include "BLI_math_matrix.h" + #include "DNA_image_types.h" #include "DNA_meshdata_types.h" #include "DNA_mesh_types.h" @@ -31,11 +37,6 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BLI_utildefines.h" -#include "BLI_bitmap.h" -#include "BLI_math_vector.h" -#include "BLI_math_matrix.h" - #include "BKE_deform.h" #include "BKE_editmesh.h" #include "BKE_image.h" diff --git a/source/blender/modifiers/intern/MOD_uvproject.c b/source/blender/modifiers/intern/MOD_uvproject.c index 8c7270daa33..670cceb1ed5 100644 --- a/source/blender/modifiers/intern/MOD_uvproject.c +++ b/source/blender/modifiers/intern/MOD_uvproject.c @@ -24,15 +24,15 @@ /* UV Project modifier: Generates UVs projected from an object */ -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" -#include "DNA_camera_types.h" -#include "DNA_object_types.h" +#include "BLI_utildefines.h" #include "BLI_math.h" #include "BLI_uvproject.h" -#include "BLI_utildefines.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" #include "BKE_library_query.h" diff --git a/source/blender/modifiers/intern/MOD_uvwarp.c b/source/blender/modifiers/intern/MOD_uvwarp.c index 27660545329..8bf950ff175 100644 --- a/source/blender/modifiers/intern/MOD_uvwarp.c +++ b/source/blender/modifiers/intern/MOD_uvwarp.c @@ -20,13 +20,14 @@ #include -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" -#include "DNA_object_types.h" +#include "BLI_utildefines.h" #include "BLI_math.h" #include "BLI_task.h" -#include "BLI_utildefines.h" + +#include "DNA_mesh_types.h" +#include "DNA_meshdata_types.h" +#include "DNA_object_types.h" #include "BKE_action.h" /* BKE_pose_channel_find_name */ #include "BKE_deform.h" diff --git a/source/blender/modifiers/intern/MOD_warp.c b/source/blender/modifiers/intern/MOD_warp.c index 674f9789ebc..9276b7df9b3 100644 --- a/source/blender/modifiers/intern/MOD_warp.c +++ b/source/blender/modifiers/intern/MOD_warp.c @@ -22,13 +22,14 @@ #include "MEM_guardedalloc.h" +#include "BLI_utildefines.h" + +#include "BLI_math.h" + #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" -#include "BLI_math.h" -#include "BLI_utildefines.h" - #include "BKE_editmesh.h" #include "BKE_library.h" #include "BKE_library_query.h" diff --git a/source/blender/modifiers/intern/MOD_wave.c b/source/blender/modifiers/intern/MOD_wave.c index 3029888621c..dce78819925 100644 --- a/source/blender/modifiers/intern/MOD_wave.c +++ b/source/blender/modifiers/intern/MOD_wave.c @@ -22,6 +22,8 @@ */ +#include "BLI_utildefines.h" + #include "BLI_math.h" #include "DNA_mesh_types.h" @@ -29,9 +31,6 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BLI_utildefines.h" - - #include "BKE_deform.h" #include "BKE_editmesh.h" #include "BKE_library.h" diff --git a/source/blender/modifiers/intern/MOD_weighted_normal.c b/source/blender/modifiers/intern/MOD_weighted_normal.c index 74ecd87e372..036cb6cc23c 100644 --- a/source/blender/modifiers/intern/MOD_weighted_normal.c +++ b/source/blender/modifiers/intern/MOD_weighted_normal.c @@ -20,6 +20,9 @@ #include "MEM_guardedalloc.h" +#include "BLI_linklist.h" +#include "BLI_math.h" + #include "DNA_mesh_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" @@ -29,9 +32,6 @@ #include "BKE_library.h" #include "BKE_mesh.h" -#include "BLI_math.h" -#include "BLI_linklist.h" - #include "MOD_modifiertypes.h" #include "MOD_util.h" diff --git a/source/blender/modifiers/intern/MOD_weightvg_util.c b/source/blender/modifiers/intern/MOD_weightvg_util.c index bf2f454a348..85cf3102733 100644 --- a/source/blender/modifiers/intern/MOD_weightvg_util.c +++ b/source/blender/modifiers/intern/MOD_weightvg_util.c @@ -21,10 +21,11 @@ * \ingroup modifiers */ +#include "BLI_utildefines.h" + #include "BLI_math.h" #include "BLI_rand.h" #include "BLI_string.h" -#include "BLI_utildefines.h" #include "DNA_color_types.h" /* CurveMapping. */ #include "DNA_mesh_types.h" diff --git a/source/blender/modifiers/intern/MOD_weightvgedit.c b/source/blender/modifiers/intern/MOD_weightvgedit.c index 164f1d0228b..8723136078e 100644 --- a/source/blender/modifiers/intern/MOD_weightvgedit.c +++ b/source/blender/modifiers/intern/MOD_weightvgedit.c @@ -22,6 +22,7 @@ */ #include "BLI_utildefines.h" + #include "BLI_ghash.h" #include "BLI_listbase.h" #include "BLI_rand.h" diff --git a/source/blender/modifiers/intern/MOD_weightvgmix.c b/source/blender/modifiers/intern/MOD_weightvgmix.c index 4b3c36a949b..f54efc0e4dd 100644 --- a/source/blender/modifiers/intern/MOD_weightvgmix.c +++ b/source/blender/modifiers/intern/MOD_weightvgmix.c @@ -22,8 +22,9 @@ */ #include "BLI_utildefines.h" -#include "BLI_math.h" + #include "BLI_listbase.h" +#include "BLI_math.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" diff --git a/source/blender/modifiers/intern/MOD_weightvgproximity.c b/source/blender/modifiers/intern/MOD_weightvgproximity.c index 54b77720bfd..8df4b1df780 100644 --- a/source/blender/modifiers/intern/MOD_weightvgproximity.c +++ b/source/blender/modifiers/intern/MOD_weightvgproximity.c @@ -22,6 +22,7 @@ */ #include "BLI_utildefines.h" + #include "BLI_ghash.h" #include "BLI_listbase.h" #include "BLI_math.h" diff --git a/source/blender/modifiers/intern/MOD_wireframe.c b/source/blender/modifiers/intern/MOD_wireframe.c index cdde7040b51..39c932e8afa 100644 --- a/source/blender/modifiers/intern/MOD_wireframe.c +++ b/source/blender/modifiers/intern/MOD_wireframe.c @@ -18,11 +18,11 @@ * \ingroup modifiers */ +#include "BLI_utildefines.h" + #include "DNA_mesh_types.h" #include "DNA_object_types.h" -#include "BLI_utildefines.h" - #include "BKE_deform.h" #include "BKE_mesh.h" -- cgit v1.2.3