diff options
Diffstat (limited to 'source/blender')
30 files changed, 109 insertions, 90 deletions
diff --git a/source/blender/modifiers/intern/MOD_armature.c b/source/blender/modifiers/intern/MOD_armature.c index cd54b06435c..e58beaaa42d 100644 --- a/source/blender/modifiers/intern/MOD_armature.c +++ b/source/blender/modifiers/intern/MOD_armature.c @@ -24,12 +24,12 @@ #include <string.h> +#include "BLI_utildefines.h" + #include "DNA_armature_types.h" #include "DNA_object_types.h" #include "DNA_mesh_types.h" -#include "BLI_utildefines.h" - #include "BKE_editmesh.h" #include "BKE_lattice.h" #include "BKE_library.h" diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c index 87492f8a605..56567c79c6a 100644 --- a/source/blender/modifiers/intern/MOD_array.c +++ b/source/blender/modifiers/intern/MOD_array.c @@ -25,9 +25,10 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_utildefines.h" +#include "BLI_math.h" + #include "DNA_curve_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" diff --git a/source/blender/modifiers/intern/MOD_bevel.c b/source/blender/modifiers/intern/MOD_bevel.c index 60a4b862407..7bd877f6dee 100644 --- a/source/blender/modifiers/intern/MOD_bevel.c +++ b/source/blender/modifiers/intern/MOD_bevel.c @@ -23,14 +23,15 @@ #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 "DNA_scene_types.h" -#include "BLI_utildefines.h" -#include "BLI_math.h" - #include "BKE_deform.h" #include "BKE_mesh.h" #include "BKE_modifier.h" diff --git a/source/blender/modifiers/intern/MOD_boolean.c b/source/blender/modifiers/intern/MOD_boolean.c index 10fab203fbd..b81536ff947 100644 --- a/source/blender/modifiers/intern/MOD_boolean.c +++ b/source/blender/modifiers/intern/MOD_boolean.c @@ -25,26 +25,25 @@ #include <stdio.h> -#include "DNA_object_types.h" - #include "BLI_utildefines.h" -#include "BLI_math_matrix.h" - -#include "BKE_library_query.h" -#include "BKE_modifier.h" - -#include "MOD_util.h" #include "BLI_alloca.h" #include "BLI_math_geom.h" +#include "BLI_math_matrix.h" + +#include "DNA_mesh_types.h" +#include "DNA_meshdata_types.h" +#include "DNA_object_types.h" #include "BKE_global.h" /* only to check G.debug */ #include "BKE_library.h" +#include "BKE_library_query.h" #include "BKE_material.h" #include "BKE_mesh.h" +#include "BKE_modifier.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" + +#include "MOD_util.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 ea2750b87c7..e46c9aca5ce 100644 --- a/source/blender/modifiers/intern/MOD_build.c +++ b/source/blender/modifiers/intern/MOD_build.c @@ -24,9 +24,10 @@ #include "MEM_guardedalloc.h" #include "BLI_utildefines.h" -#include "BLI_rand.h" -#include "BLI_math_vector.h" + #include "BLI_ghash.h" +#include "BLI_math_vector.h" +#include "BLI_rand.h" #include "DNA_meshdata_types.h" #include "DNA_mesh_types.h" diff --git a/source/blender/modifiers/intern/MOD_cast.c b/source/blender/modifiers/intern/MOD_cast.c index d28610a4a7b..4aac71dd58d 100644 --- a/source/blender/modifiers/intern/MOD_cast.c +++ b/source/blender/modifiers/intern/MOD_cast.c @@ -22,13 +22,13 @@ */ -#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_utildefines.h" +#include "DNA_mesh_types.h" +#include "DNA_meshdata_types.h" +#include "DNA_object_types.h" #include "BKE_deform.h" #include "BKE_editmesh.h" diff --git a/source/blender/modifiers/intern/MOD_cloth.c b/source/blender/modifiers/intern/MOD_cloth.c index 3844fce24c3..54dcf796036 100644 --- a/source/blender/modifiers/intern/MOD_cloth.c +++ b/source/blender/modifiers/intern/MOD_cloth.c @@ -23,6 +23,10 @@ #include <string.h> +#include "BLI_utildefines.h" + +#include "BLI_listbase.h" + #include "DNA_cloth_types.h" #include "DNA_key_types.h" #include "DNA_mesh_types.h" @@ -31,9 +35,6 @@ #include "MEM_guardedalloc.h" -#include "BLI_listbase.h" -#include "BLI_utildefines.h" - #include "BKE_cloth.h" #include "BKE_effect.h" #include "BKE_global.h" diff --git a/source/blender/modifiers/intern/MOD_collision.c b/source/blender/modifiers/intern/MOD_collision.c index b525f152d6e..3e1fa4954fa 100644 --- a/source/blender/modifiers/intern/MOD_collision.c +++ b/source/blender/modifiers/intern/MOD_collision.c @@ -21,15 +21,16 @@ * \ingroup modifiers */ +#include "BLI_utildefines.h" + +#include "BLI_math.h" + #include "DNA_object_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "MEM_guardedalloc.h" -#include "BLI_math.h" -#include "BLI_utildefines.h" - #include "BKE_collision.h" #include "BKE_global.h" #include "BKE_library.h" diff --git a/source/blender/modifiers/intern/MOD_correctivesmooth.c b/source/blender/modifiers/intern/MOD_correctivesmooth.c index e9079421f4f..fa5e68fa630 100644 --- a/source/blender/modifiers/intern/MOD_correctivesmooth.c +++ b/source/blender/modifiers/intern/MOD_correctivesmooth.c @@ -23,14 +23,15 @@ * Method of smoothing deformation, also known as 'delta-mush'. */ +#include "BLI_utildefines.h" + +#include "BLI_math.h" + #include "DNA_scene_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_mesh_types.h" -#include "BLI_math.h" -#include "BLI_utildefines.h" - #include "MEM_guardedalloc.h" #include "BKE_deform.h" diff --git a/source/blender/modifiers/intern/MOD_curve.c b/source/blender/modifiers/intern/MOD_curve.c index 86eb49ea8f4..4a8b6de9981 100644 --- a/source/blender/modifiers/intern/MOD_curve.c +++ b/source/blender/modifiers/intern/MOD_curve.c @@ -23,12 +23,12 @@ #include <string.h> +#include "BLI_utildefines.h" + #include "DNA_mesh_types.h" #include "DNA_scene_types.h" #include "DNA_object_types.h" -#include "BLI_utildefines.h" - #include "BKE_editmesh.h" #include "BKE_lattice.h" #include "BKE_library.h" diff --git a/source/blender/modifiers/intern/MOD_datatransfer.c b/source/blender/modifiers/intern/MOD_datatransfer.c index 9d613107905..d7b18074b09 100644 --- a/source/blender/modifiers/intern/MOD_datatransfer.c +++ b/source/blender/modifiers/intern/MOD_datatransfer.c @@ -22,6 +22,7 @@ */ #include "BLI_utildefines.h" + #include "BLI_math.h" #include "DNA_mesh_types.h" diff --git a/source/blender/modifiers/intern/MOD_decimate.c b/source/blender/modifiers/intern/MOD_decimate.c index 95b71d36926..fbc3529c221 100644 --- a/source/blender/modifiers/intern/MOD_decimate.c +++ b/source/blender/modifiers/intern/MOD_decimate.c @@ -21,13 +21,14 @@ * \ingroup modifiers */ +#include "BLI_utildefines.h" + +#include "BLI_math.h" + #include "DNA_object_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "BLI_math.h" -#include "BLI_utildefines.h" - #include "MEM_guardedalloc.h" #include "BKE_deform.h" diff --git a/source/blender/modifiers/intern/MOD_displace.c b/source/blender/modifiers/intern/MOD_displace.c index d1c1f74b68f..fc619837cb7 100644 --- a/source/blender/modifiers/intern/MOD_displace.c +++ b/source/blender/modifiers/intern/MOD_displace.c @@ -22,14 +22,15 @@ */ -#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 "DNA_mesh_types.h" +#include "DNA_meshdata_types.h" +#include "DNA_object_types.h" + #include "BKE_customdata.h" #include "BKE_editmesh.h" #include "BKE_library.h" diff --git a/source/blender/modifiers/intern/MOD_dynamicpaint.c b/source/blender/modifiers/intern/MOD_dynamicpaint.c index 1970774195e..3fea556c3e4 100644 --- a/source/blender/modifiers/intern/MOD_dynamicpaint.c +++ b/source/blender/modifiers/intern/MOD_dynamicpaint.c @@ -20,14 +20,14 @@ #include <stddef.h> +#include "BLI_utildefines.h" + #include "DNA_dynamicpaint_types.h" #include "DNA_object_types.h" #include "DNA_object_force_types.h" #include "DNA_scene_types.h" #include "DNA_mesh_types.h" -#include "BLI_utildefines.h" - #include "BKE_dynamicpaint.h" #include "BKE_layer.h" #include "BKE_library_query.h" diff --git a/source/blender/modifiers/intern/MOD_edgesplit.c b/source/blender/modifiers/intern/MOD_edgesplit.c index 601133a9ec6..548790ef78f 100644 --- a/source/blender/modifiers/intern/MOD_edgesplit.c +++ b/source/blender/modifiers/intern/MOD_edgesplit.c @@ -27,17 +27,18 @@ */ #include "BLI_utildefines.h" + #include "BLI_math.h" +#include "DNA_mesh_types.h" +#include "DNA_object_types.h" + #include "BKE_mesh.h" #include "BKE_modifier.h" #include "bmesh.h" #include "bmesh_tools.h" -#include "DNA_mesh_types.h" -#include "DNA_object_types.h" - #include "MOD_modifiertypes.h" static Mesh *doEdgeSplit(Mesh *mesh, EdgeSplitModifierData *emd) diff --git a/source/blender/modifiers/intern/MOD_explode.c b/source/blender/modifiers/intern/MOD_explode.c index 54874f6ee92..5c5612f29a4 100644 --- a/source/blender/modifiers/intern/MOD_explode.c +++ b/source/blender/modifiers/intern/MOD_explode.c @@ -22,17 +22,18 @@ */ +#include "BLI_utildefines.h" + +#include "BLI_edgehash.h" +#include "BLI_kdtree.h" +#include "BLI_math.h" +#include "BLI_rand.h" + #include "DNA_meshdata_types.h" #include "DNA_scene_types.h" #include "DNA_object_types.h" #include "DNA_mesh_types.h" -#include "BLI_utildefines.h" -#include "BLI_kdtree.h" -#include "BLI_rand.h" -#include "BLI_math.h" -#include "BLI_edgehash.h" - #include "BKE_deform.h" #include "BKE_lattice.h" #include "BKE_library.h" diff --git a/source/blender/modifiers/intern/MOD_fluidsim.c b/source/blender/modifiers/intern/MOD_fluidsim.c index 774217c8831..d4bac71f677 100644 --- a/source/blender/modifiers/intern/MOD_fluidsim.c +++ b/source/blender/modifiers/intern/MOD_fluidsim.c @@ -22,13 +22,13 @@ */ +#include "BLI_utildefines.h" + #include "DNA_mesh_types.h" #include "DNA_scene_types.h" #include "DNA_object_fluidsim_types.h" #include "DNA_object_types.h" -#include "BLI_utildefines.h" - #include "BKE_layer.h" #include "BKE_modifier.h" diff --git a/source/blender/modifiers/intern/MOD_fluidsim_util.c b/source/blender/modifiers/intern/MOD_fluidsim_util.c index d39329d03f1..f548eb78abd 100644 --- a/source/blender/modifiers/intern/MOD_fluidsim_util.c +++ b/source/blender/modifiers/intern/MOD_fluidsim_util.c @@ -25,23 +25,25 @@ #include <stddef.h> #include <zlib.h> +#include "BLI_utildefines.h" + +#ifdef WITH_MOD_FLUID +# include "BLI_blenlib.h" +# include "BLI_math.h" +#endif + #include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_fluidsim_types.h" -#include "BLI_utildefines.h" - #include "BKE_fluidsim.h" /* ensure definitions here match */ +#include "BKE_mesh.h" #ifdef WITH_MOD_FLUID -# include "BLI_blenlib.h" -# include "BLI_math.h" - # include "BKE_global.h" # include "BKE_library.h" #endif -#include "BKE_mesh.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/modifiers/intern/MOD_hook.c b/source/blender/modifiers/intern/MOD_hook.c index 540a0ddf208..0646f634e0d 100644 --- a/source/blender/modifiers/intern/MOD_hook.c +++ b/source/blender/modifiers/intern/MOD_hook.c @@ -22,13 +22,14 @@ */ +#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_action.h" #include "BKE_editmesh.h" #include "BKE_library.h" diff --git a/source/blender/modifiers/intern/MOD_laplaciandeform.c b/source/blender/modifiers/intern/MOD_laplaciandeform.c index 705fb017b6a..827d555e900 100644 --- a/source/blender/modifiers/intern/MOD_laplaciandeform.c +++ b/source/blender/modifiers/intern/MOD_laplaciandeform.c @@ -22,12 +22,16 @@ */ #include "BLI_utildefines.h" -#include "BLI_utildefines_stack.h" + #include "BLI_math.h" #include "BLI_string.h" +#include "BLI_utildefines_stack.h" #include "MEM_guardedalloc.h" +#include "DNA_mesh_types.h" +#include "DNA_meshdata_types.h" + #include "BKE_deform.h" #include "BKE_editmesh.h" #include "BKE_library.h" @@ -35,9 +39,6 @@ #include "BKE_mesh_runtime.h" #include "BKE_particle.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" - #include "MOD_util.h" #include "eigen_capi.h" diff --git a/source/blender/modifiers/intern/MOD_laplaciansmooth.c b/source/blender/modifiers/intern/MOD_laplaciansmooth.c index be51ecd4d93..ee9f4ad8af7 100644 --- a/source/blender/modifiers/intern/MOD_laplaciansmooth.c +++ b/source/blender/modifiers/intern/MOD_laplaciansmooth.c @@ -22,13 +22,14 @@ */ +#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 "MEM_guardedalloc.h" #include "BKE_deform.h" diff --git a/source/blender/modifiers/intern/MOD_lattice.c b/source/blender/modifiers/intern/MOD_lattice.c index c8c60c5c544..ba3624be71e 100644 --- a/source/blender/modifiers/intern/MOD_lattice.c +++ b/source/blender/modifiers/intern/MOD_lattice.c @@ -24,10 +24,10 @@ #include <string.h> -#include "DNA_object_types.h" - #include "BLI_utildefines.h" +#include "DNA_object_types.h" + #include "BKE_editmesh.h" #include "BKE_lattice.h" #include "BKE_library.h" diff --git a/source/blender/modifiers/intern/MOD_mask.c b/source/blender/modifiers/intern/MOD_mask.c index bc61ad782f0..3440f37516d 100644 --- a/source/blender/modifiers/intern/MOD_mask.c +++ b/source/blender/modifiers/intern/MOD_mask.c @@ -25,6 +25,7 @@ #include "MEM_guardedalloc.h" #include "BLI_utildefines.h" + #include "BLI_listbase.h" #include "BLI_ghash.h" diff --git a/source/blender/modifiers/intern/MOD_meshcache.c b/source/blender/modifiers/intern/MOD_meshcache.c index e7809beb65b..0ecd56372c7 100644 --- a/source/blender/modifiers/intern/MOD_meshcache.c +++ b/source/blender/modifiers/intern/MOD_meshcache.c @@ -20,16 +20,17 @@ #include <stdio.h> +#include "BLI_utildefines.h" + +#include "BLI_math.h" +#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 "BLI_utildefines.h" -#include "BLI_string.h" -#include "BLI_path_util.h" -#include "BLI_math.h" - #include "BKE_main.h" #include "BKE_mesh.h" #include "BKE_scene.h" diff --git a/source/blender/modifiers/intern/MOD_meshcache_mdd.c b/source/blender/modifiers/intern/MOD_meshcache_mdd.c index dfe7316f92b..bd99248eec4 100644 --- a/source/blender/modifiers/intern/MOD_meshcache_mdd.c +++ b/source/blender/modifiers/intern/MOD_meshcache_mdd.c @@ -22,8 +22,8 @@ #include <string.h> #include <errno.h> -#include "BLI_sys_types.h" #include "BLI_utildefines.h" + #include "BLI_fileops.h" #include "BLI_math.h" #ifdef __LITTLE_ENDIAN__ @@ -33,10 +33,10 @@ # include "BLI_winstuff.h" #endif -#include "MOD_meshcache_util.h" /* own include */ - #include "DNA_modifier_types.h" +#include "MOD_meshcache_util.h" /* own include */ + typedef struct MDDHead { int frame_tot; int verts_tot; diff --git a/source/blender/modifiers/intern/MOD_meshcache_pc2.c b/source/blender/modifiers/intern/MOD_meshcache_pc2.c index 68967d76cc9..e19a967cca7 100644 --- a/source/blender/modifiers/intern/MOD_meshcache_pc2.c +++ b/source/blender/modifiers/intern/MOD_meshcache_pc2.c @@ -22,8 +22,8 @@ #include <string.h> #include <errno.h> -#include "BLI_sys_types.h" #include "BLI_utildefines.h" + #include "BLI_fileops.h" #ifdef __BIG_ENDIAN__ # include "BLI_endian_switch.h" @@ -33,10 +33,10 @@ # include "BLI_winstuff.h" #endif -#include "MOD_meshcache_util.h" /* own include */ - #include "DNA_modifier_types.h" +#include "MOD_meshcache_util.h" /* own include */ + typedef struct PC2Head { char header[12]; /* 'POINTCACHE2\0' */ int file_version; /* unused - should be 1 */ diff --git a/source/blender/modifiers/intern/MOD_meshcache_util.c b/source/blender/modifiers/intern/MOD_meshcache_util.c index 5fcf8066bc1..2db46af1188 100644 --- a/source/blender/modifiers/intern/MOD_meshcache_util.c +++ b/source/blender/modifiers/intern/MOD_meshcache_util.c @@ -19,6 +19,7 @@ */ #include "BLI_utildefines.h" + #include "BLI_math.h" #include "DNA_modifier_types.h" diff --git a/source/blender/modifiers/intern/MOD_meshdeform.c b/source/blender/modifiers/intern/MOD_meshdeform.c index f9af370e583..1717e554798 100644 --- a/source/blender/modifiers/intern/MOD_meshdeform.c +++ b/source/blender/modifiers/intern/MOD_meshdeform.c @@ -21,15 +21,16 @@ * \ingroup modifiers */ +#include "BLI_utildefines.h" + +#include "BLI_math.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_task.h" -#include "BLI_utildefines.h" - #include "BKE_global.h" #include "BKE_library.h" #include "BKE_library_query.h" diff --git a/source/blender/modifiers/intern/MOD_mirror.c b/source/blender/modifiers/intern/MOD_mirror.c index 3be953be0b3..3f02268c04c 100644 --- a/source/blender/modifiers/intern/MOD_mirror.c +++ b/source/blender/modifiers/intern/MOD_mirror.c @@ -22,12 +22,12 @@ */ +#include "BLI_math.h" + #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" -#include "BLI_math.h" - #include "BKE_library.h" #include "BKE_library_query.h" #include "BKE_mesh.h" diff --git a/source/blender/modifiers/intern/MOD_multires.c b/source/blender/modifiers/intern/MOD_multires.c index aca16fe5ffe..86d680554c5 100644 --- a/source/blender/modifiers/intern/MOD_multires.c +++ b/source/blender/modifiers/intern/MOD_multires.c @@ -24,12 +24,12 @@ #include <stddef.h> +#include "BLI_utildefines.h" + #include "DNA_mesh_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BLI_utildefines.h" - #include "BKE_cdderivedmesh.h" #include "BKE_mesh.h" #include "BKE_multires.h" |