diff options
Diffstat (limited to 'source/blender/makesdna')
39 files changed, 115 insertions, 115 deletions
diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h index be9097cf5bd..40c25d39cad 100644 --- a/source/blender/makesdna/DNA_action_types.h +++ b/source/blender/makesdna/DNA_action_types.h @@ -32,11 +32,11 @@ extern "C" { #endif -#include "DNA_listBase.h" #include "DNA_ID.h" -#include "DNA_view2d_types.h" -#include "DNA_vec_types.h" +#include "DNA_listBase.h" #include "DNA_userdef_types.h" /* ThemeWireColor */ +#include "DNA_vec_types.h" +#include "DNA_view2d_types.h" struct Collection; struct GHash; diff --git a/source/blender/makesdna/DNA_anim_types.h b/source/blender/makesdna/DNA_anim_types.h index 7cf49053918..fbffa039ee9 100644 --- a/source/blender/makesdna/DNA_anim_types.h +++ b/source/blender/makesdna/DNA_anim_types.h @@ -29,9 +29,9 @@ extern "C" { #endif #include "DNA_ID.h" -#include "DNA_listBase.h" #include "DNA_action_types.h" #include "DNA_curve_types.h" +#include "DNA_listBase.h" /* ************************************************ */ /* F-Curve DataTypes */ diff --git a/source/blender/makesdna/DNA_armature_types.h b/source/blender/makesdna/DNA_armature_types.h index 7192b1295aa..b29816c735b 100644 --- a/source/blender/makesdna/DNA_armature_types.h +++ b/source/blender/makesdna/DNA_armature_types.h @@ -24,9 +24,9 @@ #ifndef __DNA_ARMATURE_TYPES_H__ #define __DNA_ARMATURE_TYPES_H__ +#include "DNA_ID.h" #include "DNA_defs.h" #include "DNA_listBase.h" -#include "DNA_ID.h" struct AnimData; diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h index 2168a63940f..1fad828e887 100644 --- a/source/blender/makesdna/DNA_brush_types.h +++ b/source/blender/makesdna/DNA_brush_types.h @@ -25,8 +25,8 @@ #define __DNA_BRUSH_TYPES_H__ #include "DNA_ID.h" -#include "DNA_texture_types.h" /* for MTex */ #include "DNA_curve_types.h" +#include "DNA_texture_types.h" /* for MTex */ //#ifndef MAX_MTEX // XXX Not used? //#define MAX_MTEX 18 diff --git a/source/blender/makesdna/DNA_camera_types.h b/source/blender/makesdna/DNA_camera_types.h index 7c7d4bc182e..b12d25d74e0 100644 --- a/source/blender/makesdna/DNA_camera_types.h +++ b/source/blender/makesdna/DNA_camera_types.h @@ -24,11 +24,11 @@ #ifndef __DNA_CAMERA_TYPES_H__ #define __DNA_CAMERA_TYPES_H__ +#include "DNA_ID.h" #include "DNA_defs.h" #include "DNA_gpu_types.h" -#include "DNA_movieclip_types.h" #include "DNA_image_types.h" -#include "DNA_ID.h" +#include "DNA_movieclip_types.h" #ifdef __cplusplus extern "C" { diff --git a/source/blender/makesdna/DNA_collection_types.h b/source/blender/makesdna/DNA_collection_types.h index 6d48c029437..13eb8a762d9 100644 --- a/source/blender/makesdna/DNA_collection_types.h +++ b/source/blender/makesdna/DNA_collection_types.h @@ -26,9 +26,9 @@ #ifndef __DNA_COLLECTION_TYPES_H__ #define __DNA_COLLECTION_TYPES_H__ +#include "DNA_ID.h" #include "DNA_defs.h" #include "DNA_listBase.h" -#include "DNA_ID.h" struct Collection; struct Object; diff --git a/source/blender/makesdna/DNA_constraint_types.h b/source/blender/makesdna/DNA_constraint_types.h index 18a4a134b71..9efd2116601 100644 --- a/source/blender/makesdna/DNA_constraint_types.h +++ b/source/blender/makesdna/DNA_constraint_types.h @@ -25,8 +25,8 @@ #ifndef __DNA_CONSTRAINT_TYPES_H__ #define __DNA_CONSTRAINT_TYPES_H__ -#include "DNA_defs.h" #include "DNA_ID.h" +#include "DNA_defs.h" #include "DNA_listBase.h" struct Action; diff --git a/source/blender/makesdna/DNA_curve_types.h b/source/blender/makesdna/DNA_curve_types.h index a8d10471bb8..6a081a7f5a7 100644 --- a/source/blender/makesdna/DNA_curve_types.h +++ b/source/blender/makesdna/DNA_curve_types.h @@ -24,10 +24,10 @@ #ifndef __DNA_CURVE_TYPES_H__ #define __DNA_CURVE_TYPES_H__ +#include "DNA_ID.h" #include "DNA_defs.h" #include "DNA_listBase.h" #include "DNA_vec_types.h" -#include "DNA_ID.h" #define MAXTEXTBOX 256 /* used in readfile.c and editfont.c */ diff --git a/source/blender/makesdna/DNA_gpencil_types.h b/source/blender/makesdna/DNA_gpencil_types.h index 909d65fb5ed..a90935bfe62 100644 --- a/source/blender/makesdna/DNA_gpencil_types.h +++ b/source/blender/makesdna/DNA_gpencil_types.h @@ -24,9 +24,9 @@ #ifndef __DNA_GPENCIL_TYPES_H__ #define __DNA_GPENCIL_TYPES_H__ -#include "DNA_listBase.h" #include "DNA_ID.h" #include "DNA_brush_types.h" +#include "DNA_listBase.h" struct AnimData; struct MDeformVert; diff --git a/source/blender/makesdna/DNA_image_types.h b/source/blender/makesdna/DNA_image_types.h index d443d7806ad..11a6a937e92 100644 --- a/source/blender/makesdna/DNA_image_types.h +++ b/source/blender/makesdna/DNA_image_types.h @@ -24,9 +24,9 @@ #ifndef __DNA_IMAGE_TYPES_H__ #define __DNA_IMAGE_TYPES_H__ -#include "DNA_defs.h" #include "DNA_ID.h" #include "DNA_color_types.h" /* for color management */ +#include "DNA_defs.h" struct GPUTexture; struct MovieCache; diff --git a/source/blender/makesdna/DNA_ipo_types.h b/source/blender/makesdna/DNA_ipo_types.h index 1561b44358b..0f1028f5770 100644 --- a/source/blender/makesdna/DNA_ipo_types.h +++ b/source/blender/makesdna/DNA_ipo_types.h @@ -29,8 +29,8 @@ #ifndef __DNA_IPO_TYPES_H__ #define __DNA_IPO_TYPES_H__ -#include "DNA_listBase.h" #include "DNA_curve_types.h" +#include "DNA_listBase.h" #include "DNA_vec_types.h" #include "DNA_ID.h" diff --git a/source/blender/makesdna/DNA_key_types.h b/source/blender/makesdna/DNA_key_types.h index b57f88f39af..3685290e571 100644 --- a/source/blender/makesdna/DNA_key_types.h +++ b/source/blender/makesdna/DNA_key_types.h @@ -27,9 +27,9 @@ * aren't intended to be shared between multiple data blocks as with other ID types. */ +#include "DNA_ID.h" #include "DNA_defs.h" #include "DNA_listBase.h" -#include "DNA_ID.h" struct AnimData; struct Ipo; diff --git a/source/blender/makesdna/DNA_lattice_types.h b/source/blender/makesdna/DNA_lattice_types.h index f67553c34de..336726fb28d 100644 --- a/source/blender/makesdna/DNA_lattice_types.h +++ b/source/blender/makesdna/DNA_lattice_types.h @@ -24,8 +24,8 @@ #ifndef __DNA_LATTICE_TYPES_H__ #define __DNA_LATTICE_TYPES_H__ -#include "DNA_defs.h" #include "DNA_ID.h" +#include "DNA_defs.h" struct AnimData; struct BPoint; diff --git a/source/blender/makesdna/DNA_light_types.h b/source/blender/makesdna/DNA_light_types.h index ec83d53da5e..7a7b5d923e3 100644 --- a/source/blender/makesdna/DNA_light_types.h +++ b/source/blender/makesdna/DNA_light_types.h @@ -24,8 +24,8 @@ #ifndef __DNA_LIGHT_TYPES_H__ #define __DNA_LIGHT_TYPES_H__ -#include "DNA_defs.h" #include "DNA_ID.h" +#include "DNA_defs.h" #ifndef MAX_MTEX # define MAX_MTEX 18 diff --git a/source/blender/makesdna/DNA_lightprobe_types.h b/source/blender/makesdna/DNA_lightprobe_types.h index d9cc549229d..66d6e3f4868 100644 --- a/source/blender/makesdna/DNA_lightprobe_types.h +++ b/source/blender/makesdna/DNA_lightprobe_types.h @@ -21,9 +21,9 @@ #ifndef __DNA_LIGHTPROBE_TYPES_H__ #define __DNA_LIGHTPROBE_TYPES_H__ +#include "DNA_ID.h" #include "DNA_defs.h" #include "DNA_listBase.h" -#include "DNA_ID.h" #include "BLI_assert.h" diff --git a/source/blender/makesdna/DNA_linestyle_types.h b/source/blender/makesdna/DNA_linestyle_types.h index 48850805724..eca5ab5e8ec 100644 --- a/source/blender/makesdna/DNA_linestyle_types.h +++ b/source/blender/makesdna/DNA_linestyle_types.h @@ -24,8 +24,8 @@ * \ingroup DNA */ -#include "DNA_listBase.h" #include "DNA_ID.h" +#include "DNA_listBase.h" #ifndef MAX_MTEX # define MAX_MTEX 18 diff --git a/source/blender/makesdna/DNA_mask_types.h b/source/blender/makesdna/DNA_mask_types.h index bed7f0a150d..9617b3fdf27 100644 --- a/source/blender/makesdna/DNA_mask_types.h +++ b/source/blender/makesdna/DNA_mask_types.h @@ -27,10 +27,10 @@ #ifndef __DNA_MASK_TYPES_H__ #define __DNA_MASK_TYPES_H__ -#include "DNA_defs.h" #include "DNA_ID.h" -#include "DNA_listBase.h" #include "DNA_curve_types.h" +#include "DNA_defs.h" +#include "DNA_listBase.h" typedef struct Mask { ID id; diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h index 0db7feffa99..f2e65ff9251 100644 --- a/source/blender/makesdna/DNA_material_types.h +++ b/source/blender/makesdna/DNA_material_types.h @@ -24,8 +24,8 @@ #ifndef __DNA_MATERIAL_TYPES_H__ #define __DNA_MATERIAL_TYPES_H__ -#include "DNA_defs.h" #include "DNA_ID.h" +#include "DNA_defs.h" #include "DNA_listBase.h" #ifndef MAX_MTEX diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h index c65de9337fa..3c05755159d 100644 --- a/source/blender/makesdna/DNA_mesh_types.h +++ b/source/blender/makesdna/DNA_mesh_types.h @@ -24,9 +24,9 @@ #ifndef __DNA_MESH_TYPES_H__ #define __DNA_MESH_TYPES_H__ -#include "DNA_defs.h" #include "DNA_ID.h" #include "DNA_customdata_types.h" +#include "DNA_defs.h" #ifdef __cplusplus extern "C" { diff --git a/source/blender/makesdna/DNA_meta_types.h b/source/blender/makesdna/DNA_meta_types.h index 8b218dd7ce6..df4558dac77 100644 --- a/source/blender/makesdna/DNA_meta_types.h +++ b/source/blender/makesdna/DNA_meta_types.h @@ -24,9 +24,9 @@ #ifndef __DNA_META_TYPES_H__ #define __DNA_META_TYPES_H__ +#include "DNA_ID.h" #include "DNA_defs.h" #include "DNA_listBase.h" -#include "DNA_ID.h" struct AnimData; struct BoundBox; diff --git a/source/blender/makesdna/DNA_movieclip_types.h b/source/blender/makesdna/DNA_movieclip_types.h index 92fa9973759..557e069a4a6 100644 --- a/source/blender/makesdna/DNA_movieclip_types.h +++ b/source/blender/makesdna/DNA_movieclip_types.h @@ -29,8 +29,8 @@ extern "C" { #endif #include "DNA_ID.h" -#include "DNA_tracking_types.h" #include "DNA_color_types.h" /* for color management */ +#include "DNA_tracking_types.h" struct AnimData; struct ImBuf; diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h index 50c0586ff37..8029e8ebc13 100644 --- a/source/blender/makesdna/DNA_node_types.h +++ b/source/blender/makesdna/DNA_node_types.h @@ -25,10 +25,10 @@ #define __DNA_NODE_TYPES_H__ #include "DNA_ID.h" -#include "DNA_vec_types.h" #include "DNA_listBase.h" -#include "DNA_texture_types.h" #include "DNA_scene_types.h" +#include "DNA_texture_types.h" +#include "DNA_vec_types.h" struct AnimData; struct ID; diff --git a/source/blender/makesdna/DNA_object_force_types.h b/source/blender/makesdna/DNA_object_force_types.h index 8afb74e0786..88c712b5b28 100644 --- a/source/blender/makesdna/DNA_object_force_types.h +++ b/source/blender/makesdna/DNA_object_force_types.h @@ -28,8 +28,8 @@ extern "C" { #endif -#include "DNA_listBase.h" #include "DNA_defs.h" +#include "DNA_listBase.h" /* pd->forcefield: Effector Fields types */ typedef enum ePFieldType { diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 645611144e9..1a76d32dc2c 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -27,11 +27,11 @@ #include "DNA_object_enums.h" -#include "DNA_defs.h" -#include "DNA_customdata_types.h" -#include "DNA_listBase.h" #include "DNA_ID.h" #include "DNA_action_types.h" /* bAnimVizSettings */ +#include "DNA_customdata_types.h" +#include "DNA_defs.h" +#include "DNA_listBase.h" #ifdef __cplusplus extern "C" { diff --git a/source/blender/makesdna/DNA_particle_types.h b/source/blender/makesdna/DNA_particle_types.h index 89c90a1d7f9..5bd11ab85a5 100644 --- a/source/blender/makesdna/DNA_particle_types.h +++ b/source/blender/makesdna/DNA_particle_types.h @@ -24,9 +24,9 @@ #ifndef __DNA_PARTICLE_TYPES_H__ #define __DNA_PARTICLE_TYPES_H__ -#include "DNA_defs.h" #include "DNA_ID.h" #include "DNA_boid_types.h" +#include "DNA_defs.h" struct AnimData; diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 236f9fa4eb2..c1a6265b53b 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -33,17 +33,17 @@ extern "C" { #endif +#include "DNA_ID.h" +#include "DNA_collection_types.h" #include "DNA_color_types.h" /* color management */ #include "DNA_curveprofile_types.h" #include "DNA_customdata_types.h" /* Scene's runtime cddata masks. */ -#include "DNA_vec_types.h" -#include "DNA_listBase.h" -#include "DNA_ID.h" #include "DNA_freestyle_types.h" -#include "DNA_collection_types.h" #include "DNA_layer_types.h" +#include "DNA_listBase.h" #include "DNA_material_types.h" #include "DNA_userdef_types.h" +#include "DNA_vec_types.h" #include "DNA_view3d_types.h" struct AnimData; diff --git a/source/blender/makesdna/DNA_screen_types.h b/source/blender/makesdna/DNA_screen_types.h index 189f5542ea0..9a59b69604d 100644 --- a/source/blender/makesdna/DNA_screen_types.h +++ b/source/blender/makesdna/DNA_screen_types.h @@ -26,8 +26,8 @@ #include "DNA_defs.h" #include "DNA_listBase.h" -#include "DNA_view2d_types.h" #include "DNA_vec_types.h" +#include "DNA_view2d_types.h" #include "DNA_ID.h" diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h index c275c8187e4..17b3528aadf 100644 --- a/source/blender/makesdna/DNA_sequence_types.h +++ b/source/blender/makesdna/DNA_sequence_types.h @@ -31,8 +31,8 @@ #ifndef __DNA_SEQUENCE_TYPES_H__ #define __DNA_SEQUENCE_TYPES_H__ -#include "DNA_defs.h" #include "DNA_color_types.h" +#include "DNA_defs.h" #include "DNA_listBase.h" #include "DNA_vec_types.h" #include "DNA_vfont_types.h" diff --git a/source/blender/makesdna/DNA_sound_types.h b/source/blender/makesdna/DNA_sound_types.h index e2f7bab8102..73f0e20efcb 100644 --- a/source/blender/makesdna/DNA_sound_types.h +++ b/source/blender/makesdna/DNA_sound_types.h @@ -23,8 +23,8 @@ #ifndef __DNA_SOUND_TYPES_H__ #define __DNA_SOUND_TYPES_H__ -#include "DNA_defs.h" #include "DNA_ID.h" +#include "DNA_defs.h" /* stupid... could easily be solved */ #include "DNA_view2d_types.h" diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index f12ed0553ce..9d05e244c9d 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -25,15 +25,15 @@ #ifndef __DNA_SPACE_TYPES_H__ #define __DNA_SPACE_TYPES_H__ +#include "DNA_color_types.h" /* for Histogram */ #include "DNA_defs.h" +#include "DNA_image_types.h" /* ImageUser */ #include "DNA_listBase.h" -#include "DNA_color_types.h" /* for Histogram */ -#include "DNA_vec_types.h" -#include "DNA_outliner_types.h" /* for TreeStoreElem */ -#include "DNA_image_types.h" /* ImageUser */ #include "DNA_movieclip_types.h" /* MovieClipUser */ -#include "DNA_sequence_types.h" /* SequencerScopes */ #include "DNA_node_types.h" /* for bNodeInstanceKey */ +#include "DNA_outliner_types.h" /* for TreeStoreElem */ +#include "DNA_sequence_types.h" /* SequencerScopes */ +#include "DNA_vec_types.h" /* Hum ... Not really nice... but needed for spacebuts. */ #include "DNA_view2d_types.h" diff --git a/source/blender/makesdna/DNA_text_types.h b/source/blender/makesdna/DNA_text_types.h index 8303f2322b6..dbd5def74d4 100644 --- a/source/blender/makesdna/DNA_text_types.h +++ b/source/blender/makesdna/DNA_text_types.h @@ -26,8 +26,8 @@ #ifndef __DNA_TEXT_TYPES_H__ #define __DNA_TEXT_TYPES_H__ -#include "DNA_listBase.h" #include "DNA_ID.h" +#include "DNA_listBase.h" typedef struct TextLine { struct TextLine *next, *prev; diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h index 3d3d215b973..907fe29263f 100644 --- a/source/blender/makesdna/DNA_texture_types.h +++ b/source/blender/makesdna/DNA_texture_types.h @@ -24,8 +24,8 @@ #ifndef __DNA_TEXTURE_TYPES_H__ #define __DNA_TEXTURE_TYPES_H__ -#include "DNA_defs.h" #include "DNA_ID.h" +#include "DNA_defs.h" #include "DNA_image_types.h" /* ImageUser */ #ifdef __cplusplus diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h index 3dc29d40bc1..3e348f7f502 100644 --- a/source/blender/makesdna/DNA_view3d_types.h +++ b/source/blender/makesdna/DNA_view3d_types.h @@ -34,10 +34,10 @@ struct bGPdata; struct wmTimer; #include "DNA_defs.h" -#include "DNA_listBase.h" #include "DNA_image_types.h" -#include "DNA_object_types.h" +#include "DNA_listBase.h" #include "DNA_movieclip_types.h" +#include "DNA_object_types.h" #include "DNA_view3d_enums.h" typedef struct RegionView3D { diff --git a/source/blender/makesdna/DNA_windowmanager_types.h b/source/blender/makesdna/DNA_windowmanager_types.h index 321e3925155..e1e8d808c60 100644 --- a/source/blender/makesdna/DNA_windowmanager_types.h +++ b/source/blender/makesdna/DNA_windowmanager_types.h @@ -26,8 +26,8 @@ #include "DNA_listBase.h" #include "DNA_screen_types.h" -#include "DNA_vec_types.h" #include "DNA_userdef_types.h" +#include "DNA_vec_types.h" #include "DNA_xr_types.h" #include "DNA_ID.h" diff --git a/source/blender/makesdna/DNA_world_types.h b/source/blender/makesdna/DNA_world_types.h index 8d9fd9f1af4..f9198194a89 100644 --- a/source/blender/makesdna/DNA_world_types.h +++ b/source/blender/makesdna/DNA_world_types.h @@ -24,8 +24,8 @@ #ifndef __DNA_WORLD_TYPES_H__ #define __DNA_WORLD_TYPES_H__ -#include "DNA_defs.h" #include "DNA_ID.h" +#include "DNA_defs.h" struct AnimData; struct Ipo; diff --git a/source/blender/makesdna/intern/dna_defaults.c b/source/blender/makesdna/intern/dna_defaults.c index a8be435b902..dadd2fd9d7d 100644 --- a/source/blender/makesdna/intern/dna_defaults.c +++ b/source/blender/makesdna/intern/dna_defaults.c @@ -40,17 +40,17 @@ * \note Struct members only define their members (pointers are left as NULL set). */ +#include <limits.h> #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <limits.h> #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_endian_switch.h" -#include "BLI_memarena.h" #include "BLI_math.h" +#include "BLI_memarena.h" +#include "BLI_utildefines.h" #include "DNA_defaults.h" @@ -58,8 +58,8 @@ #include "DNA_cachefile_types.h" #include "DNA_camera_types.h" #include "DNA_curve_types.h" -#include "DNA_image_types.h" #include "DNA_hair_types.h" +#include "DNA_image_types.h" #include "DNA_key_types.h" #include "DNA_lattice_types.h" #include "DNA_light_types.h" @@ -81,8 +81,8 @@ #include "DNA_cachefile_defaults.h" #include "DNA_camera_defaults.h" #include "DNA_curve_defaults.h" -#include "DNA_image_defaults.h" #include "DNA_hair_defaults.h" +#include "DNA_image_defaults.h" #include "DNA_lattice_defaults.h" #include "DNA_light_defaults.h" #include "DNA_lightprobe_defaults.h" diff --git a/source/blender/makesdna/intern/dna_genfile.c b/source/blender/makesdna/intern/dna_genfile.c index 6b3095c7925..c3cc3256125 100644 --- a/source/blender/makesdna/intern/dna_genfile.c +++ b/source/blender/makesdna/intern/dna_genfile.c @@ -27,17 +27,17 @@ * SDNA and the SDNA of the current (running) version of Blender. */ +#include <limits.h> #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <limits.h> #include "MEM_guardedalloc.h" // for MEM_freeN MEM_mallocN MEM_callocN -#include "BLI_utildefines.h" #include "BLI_endian_switch.h" #include "BLI_memarena.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "BLI_ghash.h" diff --git a/source/blender/makesdna/intern/dna_utils.c b/source/blender/makesdna/intern/dna_utils.c index c402b36812b..6708365a4c8 100644 --- a/source/blender/makesdna/intern/dna_utils.c +++ b/source/blender/makesdna/intern/dna_utils.c @@ -26,10 +26,10 @@ #include "MEM_guardedalloc.h" -#include "BLI_sys_types.h" -#include "BLI_utildefines.h" #include "BLI_assert.h" #include "BLI_ghash.h" +#include "BLI_sys_types.h" +#include "BLI_utildefines.h" #include "BLI_memarena.h" diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c index 3d82df79e4c..39b26fef176 100644 --- a/source/blender/makesdna/intern/makesdna.c +++ b/source/blender/makesdna/intern/makesdna.c @@ -43,18 +43,18 @@ #define DNA_DEPRECATED_ALLOW -#include <string.h> -#include <stdlib.h> -#include <stdio.h> #include <assert.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_alloca.h" #include "BLI_ghash.h" #include "BLI_memarena.h" #include "BLI_sys_types.h" /* for intptr_t support */ +#include "BLI_utildefines.h" #include "dna_utils.h" @@ -1536,76 +1536,76 @@ int main(int argc, char **argv) # pragma GCC poison long #endif -#include "DNA_listBase.h" -#include "DNA_vec_types.h" #include "DNA_ID.h" -#include "DNA_ipo_types.h" -#include "DNA_key_types.h" -#include "DNA_text_types.h" -#include "DNA_packedFile_types.h" +#include "DNA_action_types.h" +#include "DNA_anim_types.h" +#include "DNA_armature_types.h" +#include "DNA_boid_types.h" +#include "DNA_brush_types.h" +#include "DNA_cachefile_types.h" #include "DNA_camera_types.h" +#include "DNA_cloth_types.h" +#include "DNA_collection_types.h" +#include "DNA_color_types.h" +#include "DNA_constraint_types.h" +#include "DNA_curve_types.h" +#include "DNA_curveprofile_types.h" +#include "DNA_customdata_types.h" +#include "DNA_dynamicpaint_types.h" +#include "DNA_effect_types.h" +#include "DNA_fileglobal_types.h" +#include "DNA_fluid_types.h" +#include "DNA_freestyle_types.h" +#include "DNA_gpencil_modifier_types.h" +#include "DNA_gpencil_types.h" +#include "DNA_hair_types.h" #include "DNA_image_types.h" -#include "DNA_texture_types.h" +#include "DNA_ipo_types.h" +#include "DNA_key_types.h" +#include "DNA_lattice_types.h" +#include "DNA_layer_types.h" #include "DNA_light_types.h" +#include "DNA_lightprobe_types.h" +#include "DNA_linestyle_types.h" +#include "DNA_listBase.h" +#include "DNA_mask_types.h" #include "DNA_material_types.h" -#include "DNA_vfont_types.h" -#include "DNA_meta_types.h" -#include "DNA_curve_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" +#include "DNA_meta_types.h" #include "DNA_modifier_types.h" -#include "DNA_lattice_types.h" -#include "DNA_object_types.h" -#include "DNA_object_force_types.h" +#include "DNA_movieclip_types.h" +#include "DNA_nla_types.h" +#include "DNA_node_types.h" #include "DNA_object_fluidsim_types.h" -#include "DNA_world_types.h" +#include "DNA_object_force_types.h" +#include "DNA_object_types.h" +#include "DNA_outliner_types.h" +#include "DNA_packedFile_types.h" +#include "DNA_particle_types.h" +#include "DNA_pointcloud_types.h" +#include "DNA_rigidbody_types.h" #include "DNA_scene_types.h" -#include "DNA_view3d_types.h" -#include "DNA_view2d_types.h" -#include "DNA_space_types.h" -#include "DNA_userdef_types.h" #include "DNA_screen_types.h" #include "DNA_sdna_types.h" -#include "DNA_fileglobal_types.h" #include "DNA_sequence_types.h" -#include "DNA_effect_types.h" -#include "DNA_outliner_types.h" -#include "DNA_sound_types.h" -#include "DNA_collection_types.h" -#include "DNA_armature_types.h" -#include "DNA_action_types.h" -#include "DNA_constraint_types.h" -#include "DNA_nla_types.h" -#include "DNA_node_types.h" -#include "DNA_color_types.h" -#include "DNA_brush_types.h" -#include "DNA_customdata_types.h" -#include "DNA_particle_types.h" -#include "DNA_cloth_types.h" -#include "DNA_gpencil_types.h" -#include "DNA_gpencil_modifier_types.h" #include "DNA_shader_fx_types.h" -#include "DNA_windowmanager_types.h" -#include "DNA_anim_types.h" -#include "DNA_boid_types.h" -#include "DNA_fluid_types.h" +#include "DNA_sound_types.h" +#include "DNA_space_types.h" #include "DNA_speaker_types.h" -#include "DNA_movieclip_types.h" +#include "DNA_text_types.h" +#include "DNA_texture_types.h" #include "DNA_tracking_types.h" -#include "DNA_dynamicpaint_types.h" -#include "DNA_mask_types.h" -#include "DNA_rigidbody_types.h" -#include "DNA_freestyle_types.h" -#include "DNA_linestyle_types.h" -#include "DNA_cachefile_types.h" -#include "DNA_layer_types.h" +#include "DNA_userdef_types.h" +#include "DNA_vec_types.h" +#include "DNA_vfont_types.h" +#include "DNA_view2d_types.h" +#include "DNA_view3d_types.h" +#include "DNA_volume_types.h" +#include "DNA_windowmanager_types.h" #include "DNA_workspace_types.h" -#include "DNA_lightprobe_types.h" -#include "DNA_curveprofile_types.h" +#include "DNA_world_types.h" #include "DNA_xr_types.h" -#include "DNA_hair_types.h" -#include "DNA_pointcloud_types.h" -#include "DNA_volume_types.h" /* end of list */ |