diff options
| author | Dalai Felinto <dalai@blender.org> | 2020-03-19 11:33:03 +0300 |
|---|---|---|
| committer | Dalai Felinto <dalai@blender.org> | 2020-03-19 11:33:58 +0300 |
| commit | 2d1cce8331f3ecdfb8cb0c651e111ffac5dc7153 (patch) | |
| tree | ec50d7bdca3901a6afcc986943011f08f9516307 /source/blender/editors | |
| parent | 008aaaa37841ca27d2bba80d8859336655cef455 (diff) | |
Cleanup: `make format` after SortedIncludes change
Diffstat (limited to 'source/blender/editors')
414 files changed, 1526 insertions, 1527 deletions
diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c index 949d7008820..67e899382bb 100644 --- a/source/blender/editors/animation/anim_channels_defines.c +++ b/source/blender/editors/animation/anim_channels_defines.c @@ -35,36 +35,36 @@ #include "DNA_armature_types.h" #include "DNA_cachefile_types.h" #include "DNA_camera_types.h" +#include "DNA_gpencil_types.h" #include "DNA_hair_types.h" -#include "DNA_object_types.h" -#include "DNA_particle_types.h" -#include "DNA_screen_types.h" -#include "DNA_scene_types.h" -#include "DNA_space_types.h" #include "DNA_key_types.h" -#include "DNA_light_types.h" #include "DNA_lattice_types.h" +#include "DNA_light_types.h" #include "DNA_linestyle_types.h" -#include "DNA_mesh_types.h" +#include "DNA_mask_types.h" #include "DNA_material_types.h" +#include "DNA_mesh_types.h" #include "DNA_meta_types.h" #include "DNA_node_types.h" +#include "DNA_object_types.h" +#include "DNA_particle_types.h" #include "DNA_pointcloud_types.h" +#include "DNA_scene_types.h" +#include "DNA_screen_types.h" +#include "DNA_space_types.h" +#include "DNA_speaker_types.h" #include "DNA_volume_types.h" #include "DNA_world_types.h" -#include "DNA_gpencil_types.h" -#include "DNA_speaker_types.h" -#include "DNA_mask_types.h" #include "RNA_access.h" #include "BKE_animsys.h" +#include "BKE_context.h" #include "BKE_curve.h" #include "BKE_gpencil.h" #include "BKE_key.h" #include "BKE_main.h" #include "BKE_nla.h" -#include "BKE_context.h" #include "GPU_immediate.h" #include "GPU_state.h" diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c index 791545f216a..f47ed85f5bf 100644 --- a/source/blender/editors/animation/anim_channels_edit.c +++ b/source/blender/editors/animation/anim_channels_edit.c @@ -28,34 +28,34 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_listbase.h" +#include "BLI_utildefines.h" #include "DNA_anim_types.h" -#include "DNA_object_types.h" -#include "DNA_scene_types.h" -#include "DNA_key_types.h" #include "DNA_gpencil_types.h" +#include "DNA_key_types.h" #include "DNA_mask_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "RNA_access.h" #include "RNA_define.h" -#include "BKE_animsys.h" #include "BKE_action.h" +#include "BKE_animsys.h" +#include "BKE_context.h" #include "BKE_fcurve.h" +#include "BKE_global.h" #include "BKE_gpencil.h" -#include "BKE_context.h" #include "BKE_lib_id.h" #include "BKE_mask.h" -#include "BKE_global.h" #include "BKE_scene.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" -#include "UI_view2d.h" #include "UI_interface.h" +#include "UI_view2d.h" #include "ED_anim_api.h" #include "ED_armature.h" diff --git a/source/blender/editors/animation/anim_deps.c b/source/blender/editors/animation/anim_deps.c index 439b8071deb..6f7770d97f1 100644 --- a/source/blender/editors/animation/anim_deps.c +++ b/source/blender/editors/animation/anim_deps.c @@ -28,17 +28,17 @@ #include "DNA_anim_types.h" #include "DNA_armature_types.h" #include "DNA_gpencil_types.h" -#include "DNA_object_types.h" -#include "DNA_node_types.h" #include "DNA_mask_types.h" +#include "DNA_node_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_sequence_types.h" #include "BLI_blenlib.h" #include "BLI_utildefines.h" -#include "BKE_animsys.h" #include "BKE_action.h" +#include "BKE_animsys.h" #include "BKE_context.h" #include "BKE_fcurve.h" #include "BKE_gpencil.h" diff --git a/source/blender/editors/animation/anim_draw.c b/source/blender/editors/animation/anim_draw.c index abcc2fe5291..77399880b8d 100644 --- a/source/blender/editors/animation/anim_draw.c +++ b/source/blender/editors/animation/anim_draw.c @@ -24,30 +24,30 @@ #include "BLI_sys_types.h" #include "DNA_anim_types.h" +#include "DNA_gpencil_types.h" +#include "DNA_mask_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" +#include "DNA_screen_types.h" #include "DNA_space_types.h" #include "DNA_userdef_types.h" -#include "DNA_screen_types.h" -#include "DNA_object_types.h" -#include "DNA_gpencil_types.h" -#include "DNA_mask_types.h" +#include "BLI_dlrbTree.h" #include "BLI_math.h" +#include "BLI_rect.h" #include "BLI_timecode.h" #include "BLI_utildefines.h" -#include "BLI_rect.h" -#include "BLI_dlrbTree.h" #include "BKE_context.h" #include "BKE_curve.h" #include "BKE_fcurve.h" #include "BKE_global.h" -#include "BKE_nla.h" #include "BKE_mask.h" +#include "BKE_nla.h" #include "ED_anim_api.h" -#include "ED_keyframes_edit.h" #include "ED_keyframes_draw.h" +#include "ED_keyframes_edit.h" #include "RNA_access.h" diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c index 0895bd4f8a2..a09db0380e6 100644 --- a/source/blender/editors/animation/anim_filter.c +++ b/source/blender/editors/animation/anim_filter.c @@ -44,13 +44,16 @@ #include "DNA_anim_types.h" #include "DNA_armature_types.h" -#include "DNA_camera_types.h" +#include "DNA_brush_types.h" #include "DNA_cachefile_types.h" +#include "DNA_camera_types.h" +#include "DNA_gpencil_types.h" #include "DNA_hair_types.h" -#include "DNA_light_types.h" +#include "DNA_key_types.h" #include "DNA_lattice_types.h" +#include "DNA_layer_types.h" +#include "DNA_light_types.h" #include "DNA_linestyle_types.h" -#include "DNA_key_types.h" #include "DNA_mask_types.h" #include "DNA_material_types.h" #include "DNA_mesh_types.h" @@ -58,28 +61,25 @@ #include "DNA_movieclip_types.h" #include "DNA_node_types.h" #include "DNA_object_force_types.h" +#include "DNA_object_types.h" #include "DNA_particle_types.h" #include "DNA_pointcloud_types.h" -#include "DNA_space_types.h" -#include "DNA_sequence_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" +#include "DNA_sequence_types.h" +#include "DNA_space_types.h" #include "DNA_speaker_types.h" +#include "DNA_userdef_types.h" #include "DNA_volume_types.h" #include "DNA_world_types.h" -#include "DNA_gpencil_types.h" -#include "DNA_brush_types.h" -#include "DNA_object_types.h" -#include "DNA_userdef_types.h" -#include "DNA_layer_types.h" #include "MEM_guardedalloc.h" -#include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_alloca.h" +#include "BLI_blenlib.h" #include "BLI_ghash.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "BKE_action.h" #include "BKE_animsys.h" @@ -90,10 +90,10 @@ #include "BKE_key.h" #include "BKE_layer.h" #include "BKE_main.h" +#include "BKE_mask.h" #include "BKE_material.h" #include "BKE_modifier.h" #include "BKE_node.h" -#include "BKE_mask.h" #include "BKE_sequencer.h" #include "ED_anim_api.h" diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c index 4e2b126e2fb..2215021ce1a 100644 --- a/source/blender/editors/animation/anim_markers.c +++ b/source/blender/editors/animation/anim_markers.c @@ -25,8 +25,8 @@ #include "MEM_guardedalloc.h" -#include "DNA_scene_types.h" #include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BLI_blenlib.h" #include "BLI_math.h" @@ -56,18 +56,18 @@ #include "UI_interface.h" #include "UI_interface_icons.h" -#include "UI_view2d.h" #include "UI_resources.h" +#include "UI_view2d.h" #include "ED_anim_api.h" #include "ED_markers.h" -#include "ED_screen.h" -#include "ED_select_utils.h" -#include "ED_util.h" #include "ED_numinput.h" #include "ED_object.h" +#include "ED_screen.h" +#include "ED_select_utils.h" #include "ED_transform.h" #include "ED_types.h" +#include "ED_util.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/animation/anim_motion_paths.c b/source/blender/editors/animation/anim_motion_paths.c index e6ab3609507..7e36799ff1b 100644 --- a/source/blender/editors/animation/anim_motion_paths.c +++ b/source/blender/editors/animation/anim_motion_paths.c @@ -22,16 +22,16 @@ #include <stdlib.h> +#include "BLI_dlrbTree.h" #include "BLI_listbase.h" #include "BLI_math.h" -#include "BLI_dlrbTree.h" #include "DNA_anim_types.h" #include "DNA_armature_types.h" #include "DNA_scene_types.h" -#include "BKE_animsys.h" #include "BKE_action.h" +#include "BKE_animsys.h" #include "BKE_main.h" #include "BKE_scene.h" diff --git a/source/blender/editors/animation/anim_ops.c b/source/blender/editors/animation/anim_ops.c index a85ec8a5d14..6b0d11802f4 100644 --- a/source/blender/editors/animation/anim_ops.c +++ b/source/blender/editors/animation/anim_ops.c @@ -21,22 +21,22 @@ * \ingroup edanimation */ -#include <stdlib.h> #include <math.h> +#include <stdlib.h> #include "BLI_sys_types.h" -#include "BLI_utildefines.h" #include "BLI_math_base.h" +#include "BLI_utildefines.h" #include "DNA_anim_types.h" #include "DNA_scene_types.h" #include "BKE_context.h" -#include "BKE_sequencer.h" #include "BKE_global.h" #include "BKE_main.h" #include "BKE_scene.h" +#include "BKE_sequencer.h" #include "UI_view2d.h" diff --git a/source/blender/editors/animation/drivers.c b/source/blender/editors/animation/drivers.c index 1af85e00045..ee0f403a155 100644 --- a/source/blender/editors/animation/drivers.c +++ b/source/blender/editors/animation/drivers.c @@ -21,15 +21,15 @@ * \ingroup edanimation */ +#include <ctype.h> #include <stdio.h> #include <string.h> -#include <ctype.h> #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "DNA_anim_types.h" #include "DNA_object_types.h" @@ -37,8 +37,8 @@ #include "DNA_texture_types.h" #include "BKE_animsys.h" -#include "BKE_fcurve.h" #include "BKE_context.h" +#include "BKE_fcurve.h" #include "BKE_report.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/animation/keyframes_draw.c b/source/blender/editors/animation/keyframes_draw.c index 479e7192b0e..4b3b730d0fe 100644 --- a/source/blender/editors/animation/keyframes_draw.c +++ b/source/blender/editors/animation/keyframes_draw.c @@ -23,25 +23,25 @@ /* System includes ----------------------------------------------------- */ +#include <float.h> #include <math.h> #include <stdlib.h> #include <string.h> -#include <float.h> #include "MEM_guardedalloc.h" #include "BLI_dlrbTree.h" #include "BLI_math.h" -#include "BLI_utildefines.h" #include "BLI_rect.h" +#include "BLI_utildefines.h" #include "DNA_anim_types.h" +#include "DNA_brush_types.h" #include "DNA_cachefile_types.h" -#include "DNA_object_types.h" -#include "DNA_scene_types.h" #include "DNA_gpencil_types.h" -#include "DNA_brush_types.h" #include "DNA_mask_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BKE_fcurve.h" diff --git a/source/blender/editors/animation/keyframes_edit.c b/source/blender/editors/animation/keyframes_edit.c index 7a24eb484ac..61488e7f63a 100644 --- a/source/blender/editors/animation/keyframes_edit.c +++ b/source/blender/editors/animation/keyframes_edit.c @@ -20,17 +20,17 @@ * \ingroup edanimation */ +#include <float.h> +#include <math.h> #include <stdlib.h> #include <string.h> -#include <math.h> -#include <float.h> #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_lasso_2d.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "DNA_anim_types.h" #include "DNA_object_types.h" diff --git a/source/blender/editors/animation/keyframes_general.c b/source/blender/editors/animation/keyframes_general.c index ed5cb65c42e..c526c185383 100644 --- a/source/blender/editors/animation/keyframes_general.c +++ b/source/blender/editors/animation/keyframes_general.c @@ -21,17 +21,17 @@ * \ingroup edanimation */ +#include <float.h> +#include <math.h> #include <stdlib.h> #include <string.h> -#include <math.h> -#include <float.h> #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" -#include "BLI_string_utils.h" #include "BLI_math.h" +#include "BLI_string_utils.h" +#include "BLI_utildefines.h" #include "DNA_anim_types.h" #include "DNA_object_types.h" @@ -39,17 +39,17 @@ #include "BKE_action.h" #include "BKE_curve.h" +#include "BKE_deform.h" #include "BKE_fcurve.h" -#include "BKE_report.h" #include "BKE_main.h" -#include "BKE_deform.h" +#include "BKE_report.h" #include "RNA_access.h" #include "RNA_enum_types.h" #include "ED_anim_api.h" -#include "ED_keyframing.h" #include "ED_keyframes_edit.h" +#include "ED_keyframing.h" /* This file contains code for various keyframe-editing tools which are 'destructive' * (i.e. they will modify the order of the keyframes, and change the size of the array). diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c index c290a2ac70a..a560192195f 100644 --- a/source/blender/editors/animation/keyframing.c +++ b/source/blender/editors/animation/keyframing.c @@ -21,11 +21,11 @@ * \ingroup edanimation */ -#include <stdio.h> +#include <float.h> +#include <math.h> #include <stddef.h> +#include <stdio.h> #include <string.h> -#include <math.h> -#include <float.h> #include "MEM_guardedalloc.h" @@ -40,9 +40,9 @@ #include "DNA_constraint_types.h" #include "DNA_key_types.h" #include "DNA_material_types.h" -#include "DNA_scene_types.h" #include "DNA_object_types.h" #include "DNA_rigidbody_types.h" +#include "DNA_scene_types.h" #include "BKE_action.h" #include "BKE_animsys.h" @@ -62,10 +62,10 @@ #include "DEG_depsgraph_query.h" #include "ED_anim_api.h" -#include "ED_keyframing.h" #include "ED_keyframes_edit.h" -#include "ED_screen.h" +#include "ED_keyframing.h" #include "ED_object.h" +#include "ED_screen.h" #include "UI_interface.h" #include "UI_resources.h" diff --git a/source/blender/editors/animation/keyingsets.c b/source/blender/editors/animation/keyingsets.c index 6f9769f9785..d30d03a1c73 100644 --- a/source/blender/editors/animation/keyingsets.c +++ b/source/blender/editors/animation/keyingsets.c @@ -21,11 +21,11 @@ * \ingroup edanimation */ -#include <stdio.h> +#include <float.h> +#include <math.h> #include <stddef.h> +#include <stdio.h> #include <string.h> -#include <math.h> -#include <float.h> #include "MEM_guardedalloc.h" @@ -33,12 +33,12 @@ #include "BLI_utildefines.h" #include "DNA_anim_types.h" -#include "DNA_scene_types.h" #include "DNA_object_types.h" +#include "DNA_scene_types.h" -#include "BKE_main.h" #include "BKE_animsys.h" #include "BKE_context.h" +#include "BKE_main.h" #include "BKE_report.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/animation/time_scrub_ui.c b/source/blender/editors/animation/time_scrub_ui.c index 74c359737b0..25b8e78de92 100644 --- a/source/blender/editors/animation/time_scrub_ui.c +++ b/source/blender/editors/animation/time_scrub_ui.c @@ -34,13 +34,13 @@ #include "UI_interface.h" #include "UI_interface_icons.h" -#include "UI_view2d.h" #include "UI_resources.h" +#include "UI_view2d.h" #include "DNA_scene_types.h" -#include "BLI_rect.h" #include "BLI_math.h" +#include "BLI_rect.h" #include "BLI_string.h" #include "BLI_timecode.h" diff --git a/source/blender/editors/armature/armature_add.c b/source/blender/editors/armature/armature_add.c index 2ebe7d6f144..e87040279af 100644 --- a/source/blender/editors/armature/armature_add.c +++ b/source/blender/editors/armature/armature_add.c @@ -30,15 +30,15 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_math.h" #include "BLI_ghash.h" +#include "BLI_math.h" #include "BLI_string_utils.h" #include "BKE_action.h" #include "BKE_constraint.h" #include "BKE_context.h" -#include "BKE_idprop.h" #include "BKE_deform.h" +#include "BKE_idprop.h" #include "BKE_layer.h" #include "RNA_access.h" diff --git a/source/blender/editors/armature/armature_edit.c b/source/blender/editors/armature/armature_edit.c index 4ca0cd117b6..c7fa63a0e48 100644 --- a/source/blender/editors/armature/armature_edit.c +++ b/source/blender/editors/armature/armature_edit.c @@ -34,18 +34,18 @@ #include "BLT_translation.h" #include "BLI_blenlib.h" -#include "BLI_math.h" #include "BLI_ghash.h" +#include "BLI_math.h" #include "BKE_action.h" #include "BKE_armature.h" #include "BKE_constraint.h" #include "BKE_context.h" -#include "BKE_layer.h" #include "BKE_global.h" +#include "BKE_layer.h" #include "BKE_main.h" -#include "BKE_report.h" #include "BKE_object.h" +#include "BKE_report.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/armature/armature_naming.c b/source/blender/editors/armature/armature_naming.c index bad4edbabaf..13660244547 100644 --- a/source/blender/editors/armature/armature_naming.c +++ b/source/blender/editors/armature/armature_naming.c @@ -28,9 +28,9 @@ #include "DNA_armature_types.h" #include "DNA_constraint_types.h" -#include "DNA_object_types.h" -#include "DNA_gpencil_types.h" #include "DNA_gpencil_modifier_types.h" +#include "DNA_gpencil_types.h" +#include "DNA_object_types.h" #include "BLI_blenlib.h" #include "BLI_ghash.h" @@ -39,16 +39,16 @@ #include "BLT_translation.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_deform.h" +#include "BKE_gpencil_modifier.h" #include "BKE_layer.h" #include "BKE_main.h" #include "BKE_modifier.h" -#include "BKE_gpencil_modifier.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/armature/armature_select.c b/source/blender/editors/armature/armature_select.c index 47eb09cdf3d..21eccd2ca1f 100644 --- a/source/blender/editors/armature/armature_select.c +++ b/source/blender/editors/armature/armature_select.c @@ -32,11 +32,11 @@ #include "BLI_math.h" #include "BLI_string_utils.h" -#include "BKE_context.h" #include "BKE_action.h" +#include "BKE_context.h" +#include "BKE_layer.h" #include "BKE_object.h" #include "BKE_report.h" -#include "BKE_layer.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/armature/armature_skinning.c b/source/blender/editors/armature/armature_skinning.c index 1cb1edaa080..87f980db7b9 100644 --- a/source/blender/editors/armature/armature_skinning.c +++ b/source/blender/editors/armature/armature_skinning.c @@ -23,8 +23,8 @@ * \ingroup edarmature */ -#include "DNA_mesh_types.h" #include "DNA_armature_types.h" +#include "DNA_mesh_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/editors/armature/editarmature_undo.c b/source/blender/editors/armature/editarmature_undo.c index 4753698ae40..c73f8f69fdd 100644 --- a/source/blender/editors/armature/editarmature_undo.c +++ b/source/blender/editors/armature/editarmature_undo.c @@ -42,8 +42,8 @@ #include "ED_undo.h" #include "ED_util.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" /** We only need this locally. */ static CLG_LogRef LOG = {"ed.undo.armature"}; diff --git a/source/blender/editors/armature/meshlaplacian.c b/source/blender/editors/armature/meshlaplacian.c index 6bf507df421..6028ddb216f 100644 --- a/source/blender/editors/armature/meshlaplacian.c +++ b/source/blender/editors/armature/meshlaplacian.c @@ -21,16 +21,16 @@ #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 "DNA_scene_types.h" -#include "BLI_math.h" +#include "BLI_alloca.h" #include "BLI_edgehash.h" +#include "BLI_math.h" #include "BLI_memarena.h" #include "BLI_string.h" -#include "BLI_alloca.h" #include "BLT_translation.h" @@ -39,8 +39,8 @@ #include "BKE_mesh_runtime.h" #include "BKE_modifier.h" -#include "ED_mesh.h" #include "ED_armature.h" +#include "ED_mesh.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/armature/pose_edit.c b/source/blender/editors/armature/pose_edit.c index 562935bbcf4..09b6cd9c8cc 100644 --- a/source/blender/editors/armature/pose_edit.c +++ b/source/blender/editors/armature/pose_edit.c @@ -24,13 +24,13 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_math.h" #include "DNA_anim_types.h" #include "DNA_armature_types.h" -#include "DNA_scene_types.h" #include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BKE_action.h" #include "BKE_anim.h" @@ -38,10 +38,10 @@ #include "BKE_context.h" #include "BKE_deform.h" #include "BKE_global.h" +#include "BKE_layer.h" #include "BKE_main.h" #include "BKE_object.h" #include "BKE_report.h" -#include "BKE_layer.h" #include "BKE_scene.h" #include "DEG_depsgraph.h" @@ -57,8 +57,8 @@ #include "ED_anim_api.h" #include "ED_armature.h" #include "ED_keyframing.h" -#include "ED_screen.h" #include "ED_object.h" +#include "ED_screen.h" #include "ED_view3d.h" #include "UI_interface.h" diff --git a/source/blender/editors/armature/pose_group.c b/source/blender/editors/armature/pose_group.c index 3ae9976c948..9cd87f476d4 100644 --- a/source/blender/editors/armature/pose_group.c +++ b/source/blender/editors/armature/pose_group.c @@ -31,8 +31,8 @@ #include "DNA_armature_types.h" #include "DNA_object_types.h" -#include "BKE_armature.h" #include "BKE_action.h" +#include "BKE_armature.h" #include "BKE_context.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/armature/pose_lib.c b/source/blender/editors/armature/pose_lib.c index 4bd7ad6629a..f759808d08e 100644 --- a/source/blender/editors/armature/pose_lib.c +++ b/source/blender/editors/armature/pose_lib.c @@ -21,8 +21,8 @@ * \ingroup edarmature */ -#include <string.h> #include <math.h> +#include <string.h> #include "MEM_guardedalloc.h" @@ -63,10 +63,10 @@ #include "ED_anim_api.h" #include "ED_armature.h" #include "ED_keyframes_draw.h" -#include "ED_keyframing.h" #include "ED_keyframes_edit.h" -#include "ED_screen.h" +#include "ED_keyframing.h" #include "ED_object.h" +#include "ED_screen.h" #include "armature_intern.h" diff --git a/source/blender/editors/armature/pose_select.c b/source/blender/editors/armature/pose_select.c index 0c359b2a757..07be2baf1ae 100644 --- a/source/blender/editors/armature/pose_select.c +++ b/source/blender/editors/armature/pose_select.c @@ -37,10 +37,10 @@ #include "BKE_armature.h" #include "BKE_constraint.h" #include "BKE_context.h" -#include "BKE_object.h" -#include "BKE_report.h" #include "BKE_layer.h" #include "BKE_modifier.h" +#include "BKE_object.h" +#include "BKE_report.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/armature/pose_slide.c b/source/blender/editors/armature/pose_slide.c index f24779e1baa..336d09f71b5 100644 --- a/source/blender/editors/armature/pose_slide.c +++ b/source/blender/editors/armature/pose_slide.c @@ -23,9 +23,9 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_blenlib.h" #include "BLI_dlrbTree.h" +#include "BLI_math.h" #include "BLT_translation.h" diff --git a/source/blender/editors/armature/pose_utils.c b/source/blender/editors/armature/pose_utils.c index 8d2d7d790d2..efb568178d9 100644 --- a/source/blender/editors/armature/pose_utils.c +++ b/source/blender/editors/armature/pose_utils.c @@ -23,8 +23,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_math.h" #include "DNA_anim_types.h" #include "DNA_armature_types.h" diff --git a/source/blender/editors/curve/curve_ops.c b/source/blender/editors/curve/curve_ops.c index 81c9c759188..02cb1ee8e1c 100644 --- a/source/blender/editors/curve/curve_ops.c +++ b/source/blender/editors/curve/curve_ops.c @@ -21,8 +21,8 @@ * \ingroup edcurve */ -#include <stdlib.h> #include <math.h> +#include <stdlib.h> #include "DNA_curve_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index 6fdf76bfb75..2911611c516 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -21,17 +21,17 @@ * \ingroup edcurve */ +#include "DNA_anim_types.h" #include "DNA_key_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_anim_types.h" #include "MEM_guardedalloc.h" #include "BLI_array_utils.h" #include "BLI_blenlib.h" -#include "BLI_math.h" #include "BLI_ghash.h" +#include "BLI_math.h" #include "BLT_translation.h" @@ -56,13 +56,13 @@ #include "WM_api.h" #include "WM_types.h" +#include "ED_curve.h" #include "ED_object.h" #include "ED_screen.h" #include "ED_transform.h" #include "ED_transform_snap_object_context.h" #include "ED_types.h" #include "ED_view3d.h" -#include "ED_curve.h" #include "curve_intern.h" diff --git a/source/blender/editors/curve/editcurve_add.c b/source/blender/editors/curve/editcurve_add.c index d97223de9b8..91d5ea58361 100644 --- a/source/blender/editors/curve/editcurve_add.c +++ b/source/blender/editors/curve/editcurve_add.c @@ -21,9 +21,9 @@ * \ingroup edcurve */ +#include "DNA_anim_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_anim_types.h" #include "MEM_guardedalloc.h" @@ -42,10 +42,10 @@ #include "WM_api.h" #include "WM_types.h" +#include "ED_curve.h" #include "ED_object.h" #include "ED_screen.h" #include "ED_view3d.h" -#include "ED_curve.h" #include "curve_intern.h" diff --git a/source/blender/editors/curve/editcurve_paint.c b/source/blender/editors/curve/editcurve_paint.c index ffc09596b03..d028a88e322 100644 --- a/source/blender/editors/curve/editcurve_paint.c +++ b/source/blender/editors/curve/editcurve_paint.c @@ -37,10 +37,10 @@ #include "WM_api.h" #include "WM_types.h" -#include "ED_space_api.h" +#include "ED_curve.h" #include "ED_screen.h" +#include "ED_space_api.h" #include "ED_view3d.h" -#include "ED_curve.h" #include "GPU_batch.h" #include "GPU_batch_presets.h" diff --git a/source/blender/editors/curve/editcurve_select.c b/source/blender/editors/curve/editcurve_select.c index 9df79a082e1..51bb1eafdb9 100644 --- a/source/blender/editors/curve/editcurve_select.c +++ b/source/blender/editors/curve/editcurve_select.c @@ -27,10 +27,10 @@ #include "MEM_guardedalloc.h" #include "BLI_bitmap.h" -#include "BLI_math.h" -#include "BLI_rand.h" #include "BLI_heap_simple.h" #include "BLI_kdtree.h" +#include "BLI_math.h" +#include "BLI_rand.h" #include "BKE_context.h" #include "BKE_curve.h" @@ -41,12 +41,12 @@ #include "WM_api.h" #include "WM_types.h" +#include "ED_curve.h" #include "ED_object.h" #include "ED_screen.h" #include "ED_select_utils.h" #include "ED_types.h" #include "ED_view3d.h" -#include "ED_curve.h" #include "curve_intern.h" diff --git a/source/blender/editors/curve/editcurve_undo.c b/source/blender/editors/curve/editcurve_undo.c index 8bcabb5ed85..94a0ef7a460 100644 --- a/source/blender/editors/curve/editcurve_undo.c +++ b/source/blender/editors/curve/editcurve_undo.c @@ -22,13 +22,13 @@ #include "CLG_log.h" +#include "DNA_anim_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_anim_types.h" +#include "BLI_array_utils.h" #include "BLI_blenlib.h" #include "BLI_ghash.h" -#include "BLI_array_utils.h" #include "BKE_animsys.h" #include "BKE_context.h" @@ -40,11 +40,11 @@ #include "DEG_depsgraph.h" -#include "ED_undo.h" #include "ED_curve.h" +#include "ED_undo.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" #include "curve_intern.h" diff --git a/source/blender/editors/curve/editfont.c b/source/blender/editors/curve/editfont.c index 5fe7082d59b..297af4cb72d 100644 --- a/source/blender/editors/curve/editfont.c +++ b/source/blender/editors/curve/editfont.c @@ -21,11 +21,11 @@ * \ingroup edcurve */ +#include <errno.h> +#include <fcntl.h> #include <stdlib.h> #include <string.h> -#include <fcntl.h> #include <wchar.h> -#include <errno.h> #include "MEM_guardedalloc.h" @@ -36,9 +36,9 @@ #include "DNA_curve_types.h" #include "DNA_object_types.h" -#include "DNA_vfont_types.h" #include "DNA_scene_types.h" #include "DNA_text_types.h" +#include "DNA_vfont_types.h" #include "BKE_context.h" #include "BKE_curve.h" diff --git a/source/blender/editors/curve/editfont_undo.c b/source/blender/editors/curve/editfont_undo.c index f00c4731b0f..af591e0c7c5 100644 --- a/source/blender/editors/curve/editfont_undo.c +++ b/source/blender/editors/curve/editfont_undo.c @@ -23,8 +23,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_array_utils.h" +#include "BLI_utildefines.h" #include "DNA_curve_types.h" #include "DNA_object_types.h" @@ -36,11 +36,11 @@ #include "DEG_depsgraph.h" -#include "ED_object.h" #include "ED_curve.h" +#include "ED_object.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" #define USE_ARRAY_STORE diff --git a/source/blender/editors/gizmo_library/gizmo_library_presets.c b/source/blender/editors/gizmo_library/gizmo_library_presets.c index fe0893ae3ff..9039851da01 100644 --- a/source/blender/editors/gizmo_library/gizmo_library_presets.c +++ b/source/blender/editors/gizmo_library/gizmo_library_presets.c @@ -26,8 +26,8 @@ #include "BLI_math.h" -#include "DNA_view3d_types.h" #include "DNA_object_types.h" +#include "DNA_view3d_types.h" #include "BKE_context.h" @@ -38,11 +38,11 @@ #include "RNA_access.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" -#include "ED_view3d.h" #include "ED_screen.h" +#include "ED_view3d.h" /* own includes */ #include "ED_gizmo_library.h" /* own include */ diff --git a/source/blender/editors/gizmo_library/gizmo_library_utils.c b/source/blender/editors/gizmo_library/gizmo_library_utils.c index 1964a2ff1a3..3902c112796 100644 --- a/source/blender/editors/gizmo_library/gizmo_library_utils.c +++ b/source/blender/editors/gizmo_library/gizmo_library_utils.c @@ -27,8 +27,8 @@ #include "BLI_math.h" -#include "DNA_view3d_types.h" #include "DNA_screen_types.h" +#include "DNA_view3d_types.h" #include "BKE_context.h" diff --git a/source/blender/editors/gizmo_library/gizmo_types/arrow3d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/arrow3d_gizmo.c index 909be74cced..da6365d724d 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/arrow3d_gizmo.c +++ b/source/blender/editors/gizmo_library/gizmo_types/arrow3d_gizmo.c @@ -50,12 +50,12 @@ #include "RNA_access.h" #include "RNA_define.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" -#include "ED_view3d.h" -#include "ED_screen.h" #include "ED_gizmo_library.h" +#include "ED_screen.h" +#include "ED_view3d.h" #include "UI_interface.h" diff --git a/source/blender/editors/gizmo_library/gizmo_types/blank3d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/blank3d_gizmo.c index e36ab0a0610..5617b6e125e 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/blank3d_gizmo.c +++ b/source/blender/editors/gizmo_library/gizmo_types/blank3d_gizmo.c @@ -27,11 +27,11 @@ #include "BKE_context.h" -#include "ED_view3d.h" #include "ED_gizmo_library.h" +#include "ED_view3d.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" /* own includes */ #include "../gizmo_geometry.h" diff --git a/source/blender/editors/gizmo_library/gizmo_types/button2d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/button2d_gizmo.c index ef3014eabc2..11253f01bf2 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/button2d_gizmo.c +++ b/source/blender/editors/gizmo_library/gizmo_types/button2d_gizmo.c @@ -32,12 +32,12 @@ #include "BKE_context.h" +#include "GPU_batch.h" +#include "GPU_batch_utils.h" #include "GPU_immediate.h" #include "GPU_immediate_util.h" #include "GPU_matrix.h" #include "GPU_select.h" -#include "GPU_batch.h" -#include "GPU_batch_utils.h" #include "GPU_state.h" #include "RNA_access.h" @@ -47,9 +47,9 @@ #include "WM_api.h" #include "WM_types.h" +#include "ED_gizmo_library.h" #include "ED_screen.h" #include "ED_view3d.h" -#include "ED_gizmo_library.h" #include "UI_interface.h" #include "UI_interface_icons.h" diff --git a/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c index 6f6f131136c..1b43479eedb 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c +++ b/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c @@ -30,17 +30,17 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_dial_2d.h" +#include "BLI_math.h" #include "BLI_rect.h" #include "BKE_context.h" -#include "GPU_matrix.h" -#include "GPU_shader.h" #include "GPU_immediate.h" #include "GPU_immediate_util.h" +#include "GPU_matrix.h" #include "GPU_select.h" +#include "GPU_shader.h" #include "GPU_state.h" #include "RNA_access.h" @@ -49,9 +49,9 @@ #include "WM_api.h" #include "WM_types.h" +#include "ED_gizmo_library.h" #include "ED_screen.h" #include "ED_view3d.h" -#include "ED_gizmo_library.h" /* own includes */ #include "../gizmo_library_intern.h" diff --git a/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c index cc69ad8f671..6855268610e 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c +++ b/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c @@ -34,11 +34,11 @@ #include "BKE_context.h" -#include "GPU_matrix.h" -#include "GPU_shader.h" #include "GPU_immediate.h" #include "GPU_immediate_util.h" +#include "GPU_matrix.h" #include "GPU_select.h" +#include "GPU_shader.h" #include "GPU_state.h" #include "RNA_access.h" @@ -47,9 +47,9 @@ #include "WM_api.h" #include "WM_types.h" +#include "ED_gizmo_library.h" #include "ED_screen.h" #include "ED_view3d.h" -#include "ED_gizmo_library.h" /* own includes */ #include "../gizmo_library_intern.h" diff --git a/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c index 0a2f0738a01..6b308308664 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c +++ b/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c @@ -50,10 +50,10 @@ #include "WM_api.h" #include "WM_types.h" +#include "ED_gizmo_library.h" #include "ED_screen.h" -#include "ED_view3d.h" #include "ED_transform.h" -#include "ED_gizmo_library.h" +#include "ED_view3d.h" /* own includes */ #include "../gizmo_geometry.h" diff --git a/source/blender/editors/gizmo_library/gizmo_types/move3d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/move3d_gizmo.c index f7d22223b55..4049a3b9dcb 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/move3d_gizmo.c +++ b/source/blender/editors/gizmo_library/gizmo_types/move3d_gizmo.c @@ -46,10 +46,10 @@ #include "WM_api.h" #include "WM_types.h" -#include "ED_screen.h" -#include "ED_view3d.h" #include "ED_gizmo_library.h" +#include "ED_screen.h" #include "ED_transform_snap_object_context.h" +#include "ED_view3d.h" /* own includes */ #include "../gizmo_geometry.h" diff --git a/source/blender/editors/gpencil/annotate_draw.c b/source/blender/editors/gpencil/annotate_draw.c index ef9b6d2943b..5c396ca9041 100644 --- a/source/blender/editors/gpencil/annotate_draw.c +++ b/source/blender/editors/gpencil/annotate_draw.c @@ -21,31 +21,31 @@ * \ingroup edgpencil */ +#include <float.h> +#include <math.h> +#include <stddef.h> #include <stdio.h> -#include <string.h> #include <stdlib.h> -#include <stddef.h> -#include <math.h> -#include <float.h> +#include <string.h> #include "MEM_guardedalloc.h" #include "BLI_sys_types.h" -#include "BLI_math.h" #include "BLI_listbase.h" +#include "BLI_math.h" #include "BLI_utildefines.h" #include "BLF_api.h" #include "BLT_translation.h" #include "DNA_gpencil_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_userdef_types.h" -#include "DNA_object_types.h" +#include "DNA_view3d_types.h" #include "BKE_context.h" #include "BKE_global.h" @@ -60,8 +60,8 @@ #include "ED_gpencil.h" #include "ED_screen.h" -#include "ED_view3d.h" #include "ED_space_api.h" +#include "ED_view3d.h" #include "UI_interface_icons.h" #include "UI_resources.h" diff --git a/source/blender/editors/gpencil/annotate_paint.c b/source/blender/editors/gpencil/annotate_paint.c index 5629e29f257..9f2c4070b18 100644 --- a/source/blender/editors/gpencil/annotate_paint.c +++ b/source/blender/editors/gpencil/annotate_paint.c @@ -21,18 +21,18 @@ * \ingroup edgpencil */ -#include <stdio.h> +#include <math.h> #include <stddef.h> +#include <stdio.h> #include <stdlib.h> #include <string.h> -#include <math.h> #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" #include "BLI_math.h" -#include "BLI_utildefines.h" #include "BLI_math_geom.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" @@ -48,17 +48,17 @@ #include "BKE_screen.h" #include "BKE_tracking.h" +#include "DNA_gpencil_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_gpencil_types.h" #include "DNA_windowmanager_types.h" #include "UI_view2d.h" +#include "ED_clip.h" #include "ED_gpencil.h" #include "ED_screen.h" #include "ED_view3d.h" -#include "ED_clip.h" #include "GPU_immediate.h" #include "GPU_immediate_util.h" diff --git a/source/blender/editors/gpencil/drawgpencil.c b/source/blender/editors/gpencil/drawgpencil.c index db13f57b192..896ef7a9ad3 100644 --- a/source/blender/editors/gpencil/drawgpencil.c +++ b/source/blender/editors/gpencil/drawgpencil.c @@ -21,40 +21,40 @@ * \ingroup edgpencil */ +#include <float.h> +#include <math.h> +#include <stddef.h> #include <stdio.h> -#include <string.h> #include <stdlib.h> -#include <stddef.h> -#include <math.h> -#include <float.h> +#include <string.h> #include "MEM_guardedalloc.h" #include "BLI_sys_types.h" #include "BLI_math.h" -#include "BLI_utildefines.h" #include "BLI_polyfill_2d.h" +#include "BLI_utildefines.h" #include "BLF_api.h" #include "BLT_translation.h" #include "DNA_brush_types.h" #include "DNA_gpencil_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_userdef_types.h" -#include "DNA_object_types.h" +#include "DNA_view3d_types.h" -#include "BKE_context.h" #include "BKE_brush.h" +#include "BKE_context.h" #include "BKE_global.h" -#include "BKE_material.h" -#include "BKE_paint.h" #include "BKE_gpencil.h" #include "BKE_image.h" +#include "BKE_material.h" +#include "BKE_paint.h" #include "DEG_depsgraph.h" @@ -67,8 +67,8 @@ #include "ED_gpencil.h" #include "ED_screen.h" -#include "ED_view3d.h" #include "ED_space_api.h" +#include "ED_view3d.h" #include "UI_interface_icons.h" #include "UI_resources.h" diff --git a/source/blender/editors/gpencil/editaction_gpencil.c b/source/blender/editors/gpencil/editaction_gpencil.c index 7f659efb099..d2b1eba7d86 100644 --- a/source/blender/editors/gpencil/editaction_gpencil.c +++ b/source/blender/editors/gpencil/editaction_gpencil.c @@ -21,11 +21,11 @@ * \ingroup edgpencil */ +#include <math.h> +#include <stddef.h> #include <stdio.h> -#include <string.h> #include <stdlib.h> -#include <stddef.h> -#include <math.h> +#include <string.h> #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/gpencil/gpencil_armature.c b/source/blender/editors/gpencil/gpencil_armature.c index 02913a19523..9566495715a 100644 --- a/source/blender/editors/gpencil/gpencil_armature.c +++ b/source/blender/editors/gpencil/gpencil_armature.c @@ -23,17 +23,17 @@ * Operators for dealing with armatures and GP data-blocks. */ +#include <math.h> +#include <stddef.h> #include <stdio.h> -#include <string.h> #include <stdlib.h> -#include <stddef.h> -#include <math.h> +#include <string.h> #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" @@ -42,13 +42,13 @@ #include "DNA_meshdata_types.h" #include "DNA_scene_types.h" -#include "BKE_main.h" #include "BKE_action.h" #include "BKE_armature.h" #include "BKE_context.h" #include "BKE_deform.h" #include "BKE_gpencil.h" #include "BKE_gpencil_modifier.h" +#include "BKE_main.h" #include "BKE_object_deform.h" #include "BKE_report.h" @@ -60,8 +60,8 @@ #include "RNA_enum_types.h" #include "ED_gpencil.h" -#include "ED_object.h" #include "ED_mesh.h" +#include "ED_object.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/editors/gpencil/gpencil_convert.c b/source/blender/editors/gpencil/gpencil_convert.c index 934466475a5..1c55c3b5a8f 100644 --- a/source/blender/editors/gpencil/gpencil_convert.c +++ b/source/blender/editors/gpencil/gpencil_convert.c @@ -22,16 +22,16 @@ * \ingroup edgpencil */ +#include <math.h> +#include <stddef.h> #include <stdio.h> -#include <string.h> #include <stdlib.h> -#include <stddef.h> -#include <math.h> +#include <string.h> #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_math.h" #include "BLI_rand.h" #include "BLI_utildefines.h" @@ -40,13 +40,13 @@ #include "DNA_anim_types.h" #include "DNA_collection_types.h" #include "DNA_curve_types.h" -#include "DNA_object_types.h" +#include "DNA_gpencil_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 "DNA_gpencil_types.h" #include "BKE_collection.h" #include "BKE_context.h" @@ -75,11 +75,11 @@ #include "UI_resources.h" #include "UI_view2d.h" -#include "ED_gpencil.h" -#include "ED_view3d.h" #include "ED_clip.h" +#include "ED_gpencil.h" #include "ED_keyframing.h" #include "ED_object.h" +#include "ED_view3d.h" #include "gpencil_intern.h" diff --git a/source/blender/editors/gpencil/gpencil_data.c b/source/blender/editors/gpencil/gpencil_data.c index 7ba4637f9d8..627bc46d06c 100644 --- a/source/blender/editors/gpencil/gpencil_data.c +++ b/source/blender/editors/gpencil/gpencil_data.c @@ -23,19 +23,19 @@ * Operators for dealing with GP data-blocks and layers. */ +#include <math.h> +#include <stddef.h> #include <stdio.h> -#include <string.h> #include <stdlib.h> -#include <stddef.h> -#include <math.h> +#include <string.h> #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_math.h" #include "BLI_string_utils.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" @@ -76,8 +76,8 @@ #include "RNA_define.h" #include "RNA_enum_types.h" -#include "ED_object.h" #include "ED_gpencil.h" +#include "ED_object.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c index 00fc6550459..bf1497fb2ed 100644 --- a/source/blender/editors/gpencil/gpencil_edit.c +++ b/source/blender/editors/gpencil/gpencil_edit.c @@ -22,11 +22,11 @@ * \ingroup edgpencil */ +#include <math.h> +#include <stddef.h> #include <stdio.h> -#include <string.h> #include <stdlib.h> -#include <stddef.h> -#include <math.h> +#include <string.h> #include "MEM_guardedalloc.h" @@ -39,13 +39,13 @@ #include "BLT_translation.h" +#include "DNA_gpencil_types.h" #include "DNA_meshdata_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_gpencil_types.h" #include "BKE_brush.h" #include "BKE_context.h" @@ -57,16 +57,16 @@ #include "BKE_object.h" #include "BKE_paint.h" #include "BKE_report.h" -#include "BKE_workspace.h" #include "BKE_scene.h" +#include "BKE_workspace.h" #include "UI_interface.h" #include "UI_resources.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" #include "WM_toolsystem.h" +#include "WM_types.h" #include "RNA_access.h" #include "RNA_define.h" @@ -77,10 +77,10 @@ #include "ED_gpencil.h" #include "ED_object.h" #include "ED_screen.h" -#include "ED_transform_snap_object_context.h" -#include "ED_view3d.h" #include "ED_select_utils.h" #include "ED_space_api.h" +#include "ED_transform_snap_object_context.h" +#include "ED_view3d.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" diff --git a/source/blender/editors/gpencil/gpencil_fill.c b/source/blender/editors/gpencil/gpencil_fill.c index a7fc5a4965b..d487f76a103 100644 --- a/source/blender/editors/gpencil/gpencil_fill.c +++ b/source/blender/editors/gpencil/gpencil_fill.c @@ -25,10 +25,10 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_blenlib.h" #include "BLI_math.h" #include "BLI_stack.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" @@ -39,16 +39,16 @@ #include "DNA_object_types.h" #include "DNA_windowmanager_types.h" -#include "BKE_main.h" #include "BKE_brush.h" +#include "BKE_context.h" #include "BKE_deform.h" -#include "BKE_image.h" #include "BKE_gpencil.h" +#include "BKE_image.h" +#include "BKE_main.h" #include "BKE_material.h" -#include "BKE_context.h" -#include "BKE_screen.h" #include "BKE_paint.h" #include "BKE_report.h" +#include "BKE_screen.h" #include "ED_gpencil.h" #include "ED_screen.h" @@ -61,9 +61,9 @@ #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" +#include "GPU_framebuffer.h" #include "GPU_immediate.h" #include "GPU_matrix.h" -#include "GPU_framebuffer.h" #include "GPU_state.h" #include "UI_interface.h" diff --git a/source/blender/editors/gpencil/gpencil_interpolate.c b/source/blender/editors/gpencil/gpencil_interpolate.c index 958728c2baf..5577a35c1fd 100644 --- a/source/blender/editors/gpencil/gpencil_interpolate.c +++ b/source/blender/editors/gpencil/gpencil_interpolate.c @@ -22,18 +22,18 @@ * \ingroup edgpencil */ +#include <math.h> +#include <stddef.h> #include <stdio.h> -#include <string.h> #include <stdlib.h> -#include <stddef.h> -#include <math.h> +#include <string.h> #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_easing.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" @@ -67,8 +67,8 @@ #include "ED_gpencil.h" #include "ED_object.h" #include "ED_screen.h" -#include "ED_view3d.h" #include "ED_space_api.h" +#include "ED_view3d.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/editors/gpencil/gpencil_ops.c b/source/blender/editors/gpencil/gpencil_ops.c index 8794a27fb96..8b126912efc 100644 --- a/source/blender/editors/gpencil/gpencil_ops.c +++ b/source/blender/editors/gpencil/gpencil_ops.c @@ -21,14 +21,14 @@ * \ingroup edgpencil */ -#include <stdlib.h> #include <stddef.h> #include <stdio.h> +#include <stdlib.h> #include "BLI_sys_types.h" -#include "BKE_context.h" #include "BKE_brush.h" +#include "BKE_context.h" #include "BKE_gpencil.h" #include "BKE_paint.h" @@ -39,14 +39,14 @@ #include "DNA_space_types.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_toolsystem.h" +#include "WM_types.h" #include "RNA_access.h" #include "ED_gpencil.h" -#include "ED_select_utils.h" #include "ED_object.h" +#include "ED_select_utils.h" #include "ED_transform.h" #include "gpencil_intern.h" diff --git a/source/blender/editors/gpencil/gpencil_ops_versioning.c b/source/blender/editors/gpencil/gpencil_ops_versioning.c index e5b9d902210..df094ff5bd0 100644 --- a/source/blender/editors/gpencil/gpencil_ops_versioning.c +++ b/source/blender/editors/gpencil/gpencil_ops_versioning.c @@ -37,13 +37,13 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BKE_main.h" #include "BKE_brush.h" #include "BKE_context.h" #include "BKE_deform.h" #include "BKE_gpencil.h" -#include "BKE_object.h" +#include "BKE_main.h" #include "BKE_material.h" +#include "BKE_object.h" #include "WM_api.h" #include "WM_types.h" @@ -51,8 +51,8 @@ #include "RNA_access.h" #include "RNA_define.h" -#include "ED_object.h" #include "ED_gpencil.h" +#include "ED_object.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c index 90076b8d91b..bec080e398d 100644 --- a/source/blender/editors/gpencil/gpencil_paint.c +++ b/source/blender/editors/gpencil/gpencil_paint.c @@ -21,53 +21,53 @@ * \ingroup edgpencil */ -#include <stdio.h> +#include <math.h> #include <stddef.h> +#include <stdio.h> #include <stdlib.h> #include <string.h> -#include <math.h> #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" #include "BLI_math.h" -#include "BLI_utildefines.h" -#include "BLI_rand.h" #include "BLI_math_geom.h" +#include "BLI_rand.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" #include "PIL_time.h" +#include "DNA_brush_types.h" +#include "DNA_gpencil_types.h" +#include "DNA_material_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_gpencil_types.h" -#include "DNA_material_types.h" -#include "DNA_brush_types.h" #include "DNA_windowmanager_types.h" -#include "BKE_colortools.h" -#include "BKE_main.h" #include "BKE_brush.h" -#include "BKE_paint.h" +#include "BKE_colortools.h" #include "BKE_context.h" #include "BKE_deform.h" #include "BKE_global.h" #include "BKE_gpencil.h" -#include "BKE_report.h" #include "BKE_layer.h" +#include "BKE_main.h" #include "BKE_material.h" +#include "BKE_paint.h" +#include "BKE_report.h" #include "BKE_screen.h" #include "BKE_tracking.h" #include "UI_view2d.h" +#include "ED_clip.h" #include "ED_gpencil.h" -#include "ED_screen.h" #include "ED_object.h" +#include "ED_screen.h" #include "ED_view3d.h" -#include "ED_clip.h" #include "GPU_immediate.h" #include "GPU_immediate_util.h" diff --git a/source/blender/editors/gpencil/gpencil_primitive.c b/source/blender/editors/gpencil/gpencil_primitive.c index f7bfc0bab8c..7470e7789af 100644 --- a/source/blender/editors/gpencil/gpencil_primitive.c +++ b/source/blender/editors/gpencil/gpencil_primitive.c @@ -22,18 +22,18 @@ * \ingroup edgpencil */ +#include <math.h> +#include <stddef.h> #include <stdio.h> -#include <string.h> #include <stdlib.h> -#include <stddef.h> -#include <math.h> +#include <string.h> #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_math.h" #include "BLI_rand.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" @@ -72,8 +72,8 @@ #include "ED_gpencil.h" #include "ED_object.h" #include "ED_screen.h" -#include "ED_view3d.h" #include "ED_space_api.h" +#include "ED_view3d.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/editors/gpencil/gpencil_sculpt_paint.c b/source/blender/editors/gpencil/gpencil_sculpt_paint.c index 8c92d53b8e6..46867dcb11a 100644 --- a/source/blender/editors/gpencil/gpencil_sculpt_paint.c +++ b/source/blender/editors/gpencil/gpencil_sculpt_paint.c @@ -22,11 +22,11 @@ * \ingroup edgpencil */ +#include <math.h> +#include <stddef.h> #include <stdio.h> -#include <string.h> #include <stdlib.h> -#include <stddef.h> -#include <math.h> +#include <string.h> #include "MEM_guardedalloc.h" @@ -40,13 +40,13 @@ #include "BLT_translation.h" +#include "DNA_gpencil_types.h" #include "DNA_meshdata_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_gpencil_types.h" -#include "DNA_object_types.h" #include "BKE_brush.h" #include "BKE_colortools.h" diff --git a/source/blender/editors/gpencil/gpencil_select.c b/source/blender/editors/gpencil/gpencil_select.c index 133891cda13..4a84d75757e 100644 --- a/source/blender/editors/gpencil/gpencil_select.c +++ b/source/blender/editors/gpencil/gpencil_select.c @@ -21,25 +21,25 @@ * \ingroup edgpencil */ +#include <math.h> +#include <stddef.h> #include <stdio.h> -#include <string.h> #include <stdlib.h> -#include <stddef.h> -#include <math.h> +#include <string.h> #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" #include "BLI_ghash.h" #include "BLI_lasso_2d.h" -#include "BLI_utildefines.h" #include "BLI_math_vector.h" +#include "BLI_utildefines.h" #include "DNA_gpencil_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_space_types.h" #include "DNA_screen_types.h" -#include "DNA_object_types.h" +#include "DNA_space_types.h" #include "BKE_context.h" #include "BKE_gpencil.h" diff --git a/source/blender/editors/gpencil/gpencil_undo.c b/source/blender/editors/gpencil/gpencil_undo.c index f9403fd94b0..c2504ce329e 100644 --- a/source/blender/editors/gpencil/gpencil_undo.c +++ b/source/blender/editors/gpencil/gpencil_undo.c @@ -27,8 +27,8 @@ #include "MEM_guardedalloc.h" #include "DNA_gpencil_types.h" -#include "DNA_object_types.h" #include "DNA_listBase.h" +#include "DNA_object_types.h" #include "DNA_windowmanager_types.h" #include "BLI_listbase.h" diff --git a/source/blender/editors/gpencil/gpencil_utils.c b/source/blender/editors/gpencil/gpencil_utils.c index 7fe6f374766..da6e5114822 100644 --- a/source/blender/editors/gpencil/gpencil_utils.c +++ b/source/blender/editors/gpencil/gpencil_utils.c @@ -20,24 +20,24 @@ * \ingroup edgpencil */ +#include <math.h> +#include <stddef.h> #include <stdio.h> -#include <string.h> #include <stdlib.h> -#include <stddef.h> -#include <math.h> +#include <string.h> #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_blenlib.h" #include "BLI_ghash.h" +#include "BLI_math.h" +#include "BLI_rand.h" #include "BLI_utildefines.h" #include "BLT_translation.h" -#include "BLI_rand.h" -#include "DNA_meshdata_types.h" -#include "DNA_gpencil_types.h" #include "DNA_brush_types.h" +#include "DNA_gpencil_types.h" +#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" @@ -45,21 +45,21 @@ #include "DNA_view3d_types.h" #include "BKE_action.h" -#include "BKE_colortools.h" -#include "BKE_collection.h" -#include "BKE_deform.h" -#include "BKE_main.h" #include "BKE_brush.h" +#include "BKE_collection.h" +#include "BKE_colortools.h" #include "BKE_context.h" +#include "BKE_deform.h" #include "BKE_gpencil.h" +#include "BKE_main.h" +#include "BKE_material.h" #include "BKE_object.h" #include "BKE_paint.h" -#include "BKE_material.h" #include "BKE_tracking.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_toolsystem.h" +#include "WM_types.h" #include "RNA_access.h" #include "RNA_define.h" @@ -68,12 +68,12 @@ #include "UI_resources.h" #include "UI_view2d.h" -#include "ED_gpencil.h" #include "ED_clip.h" -#include "ED_view3d.h" +#include "ED_gpencil.h" #include "ED_object.h" #include "ED_screen.h" #include "ED_select_utils.h" +#include "ED_view3d.h" #include "GPU_immediate.h" #include "GPU_immediate_util.h" diff --git a/source/blender/editors/gpencil/gpencil_uv.c b/source/blender/editors/gpencil/gpencil_uv.c index 8e9d46793a9..dac19e33235 100644 --- a/source/blender/editors/gpencil/gpencil_uv.c +++ b/source/blender/editors/gpencil/gpencil_uv.c @@ -23,8 +23,8 @@ #include "DNA_gpencil_types.h" #include "BLI_blenlib.h" -#include "BLI_string.h" #include "BLI_math.h" +#include "BLI_string.h" #include "BLT_translation.h" @@ -32,8 +32,8 @@ #include "BKE_gpencil.h" #include "BKE_unit.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/gpencil/gpencil_weight_paint.c b/source/blender/editors/gpencil/gpencil_weight_paint.c index 0dace9f004b..51d5df1f405 100644 --- a/source/blender/editors/gpencil/gpencil_weight_paint.c +++ b/source/blender/editors/gpencil/gpencil_weight_paint.c @@ -38,9 +38,9 @@ #include "BKE_deform.h" #include "BKE_gpencil.h" #include "BKE_main.h" -#include "DNA_meshdata_types.h" #include "BKE_object_deform.h" #include "BKE_report.h" +#include "DNA_meshdata_types.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h index cad8b34557f..f532d7c1f14 100644 --- a/source/blender/editors/include/ED_object.h +++ b/source/blender/editors/include/ED_object.h @@ -54,8 +54,8 @@ struct wmOperator; struct wmOperatorType; struct wmWindowManager; -#include "DNA_object_enums.h" #include "BLI_compiler_attrs.h" +#include "DNA_object_enums.h" /* object_edit.c */ /* context.object */ diff --git a/source/blender/editors/include/ED_view3d_offscreen.h b/source/blender/editors/include/ED_view3d_offscreen.h index e1ed7472973..11d1aed1e73 100644 --- a/source/blender/editors/include/ED_view3d_offscreen.h +++ b/source/blender/editors/include/ED_view3d_offscreen.h @@ -24,8 +24,8 @@ #ifndef __ED_VIEW3D_OFFSCREEN_H__ #define __ED_VIEW3D_OFFSCREEN_H__ -#include "DNA_view3d_types.h" #include "DNA_object_enums.h" +#include "DNA_view3d_types.h" #include "IMB_imbuf_types.h" diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index 3d8c0da78ea..2a4ca48a005 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -21,12 +21,12 @@ * \ingroup edinterface */ +#include <ctype.h> #include <float.h> #include <limits.h> #include <math.h> -#include <string.h> -#include <ctype.h> #include <stddef.h> /* offsetof() */ +#include <string.h> #include "MEM_guardedalloc.h" @@ -36,11 +36,11 @@ #include "DNA_userdef_types.h" #include "DNA_workspace_types.h" -#include "BLI_math.h" #include "BLI_listbase.h" +#include "BLI_math.h" +#include "BLI_rect.h" #include "BLI_string.h" #include "BLI_string_utf8.h" -#include "BLI_rect.h" #include "BLI_utildefines.h" @@ -65,15 +65,15 @@ #include "IMB_imbuf.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" +#include "WM_types.h" #include "RNA_access.h" #include "BPY_extern.h" -#include "ED_screen.h" #include "ED_numinput.h" +#include "ED_screen.h" #include "IMB_colormanagement.h" diff --git a/source/blender/editors/interface/interface_context_menu.c b/source/blender/editors/interface/interface_context_menu.c index 7a300860583..76107d190ba 100644 --- a/source/blender/editors/interface/interface_context_menu.c +++ b/source/blender/editors/interface/interface_context_menu.c @@ -38,8 +38,8 @@ #include "BKE_idprop.h" #include "BKE_screen.h" -#include "ED_screen.h" #include "ED_keyframing.h" +#include "ED_screen.h" #include "UI_interface.h" diff --git a/source/blender/editors/interface/interface_draw.c b/source/blender/editors/interface/interface_draw.c index 2800d808889..499d2f7f1fa 100644 --- a/source/blender/editors/interface/interface_draw.c +++ b/source/blender/editors/interface/interface_draw.c @@ -25,27 +25,27 @@ #include <string.h> #include "DNA_color_types.h" -#include "DNA_screen_types.h" -#include "DNA_movieclip_types.h" #include "DNA_curveprofile_types.h" +#include "DNA_movieclip_types.h" +#include "DNA_screen_types.h" #include "BLI_math.h" +#include "BLI_polyfill_2d.h" #include "BLI_rect.h" #include "BLI_string.h" #include "BLI_utildefines.h" -#include "BLI_polyfill_2d.h" #include "MEM_guardedalloc.h" #include "BKE_colorband.h" #include "BKE_colortools.h" +#include "BKE_curveprofile.h" #include "BKE_node.h" #include "BKE_tracking.h" -#include "BKE_curveprofile.h" +#include "IMB_colormanagement.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" -#include "IMB_colormanagement.h" #include "BIF_glutil.h" diff --git a/source/blender/editors/interface/interface_eyedropper.c b/source/blender/editors/interface/interface_eyedropper.c index cb7868d2988..f69dbb94f19 100644 --- a/source/blender/editors/interface/interface_eyedropper.c +++ b/source/blender/editors/interface/interface_eyedropper.c @@ -21,8 +21,8 @@ * \ingroup edinterface */ -#include "DNA_space_types.h" #include "DNA_screen_types.h" +#include "DNA_space_types.h" #include "BLI_blenlib.h" diff --git a/source/blender/editors/interface/interface_eyedropper_color.c b/source/blender/editors/interface/interface_eyedropper_color.c index 0dabe453ce4..372fd841bc1 100644 --- a/source/blender/editors/interface/interface_eyedropper_color.c +++ b/source/blender/editors/interface/interface_eyedropper_color.c @@ -28,8 +28,8 @@ #include "MEM_guardedalloc.h" -#include "DNA_space_types.h" #include "DNA_screen_types.h" +#include "DNA_space_types.h" #include "BLI_math_vector.h" @@ -52,9 +52,9 @@ #include "interface_intern.h" +#include "ED_clip.h" #include "ED_image.h" #include "ED_node.h" -#include "ED_clip.h" #include "interface_eyedropper_intern.h" diff --git a/source/blender/editors/interface/interface_eyedropper_colorband.c b/source/blender/editors/interface/interface_eyedropper_colorband.c index 479cf9ccffe..be23eacafff 100644 --- a/source/blender/editors/interface/interface_eyedropper_colorband.c +++ b/source/blender/editors/interface/interface_eyedropper_colorband.c @@ -38,8 +38,8 @@ #include "BLI_bitmap_draw_2d.h" #include "BLI_math_vector.h" -#include "BKE_context.h" #include "BKE_colorband.h" +#include "BKE_context.h" #include "RNA_access.h" diff --git a/source/blender/editors/interface/interface_eyedropper_datablock.c b/source/blender/editors/interface/interface_eyedropper_datablock.c index 5cf1a21d09c..46164ebac69 100644 --- a/source/blender/editors/interface/interface_eyedropper_datablock.c +++ b/source/blender/editors/interface/interface_eyedropper_datablock.c @@ -28,18 +28,18 @@ #include "MEM_guardedalloc.h" -#include "DNA_space_types.h" -#include "DNA_screen_types.h" #include "DNA_object_types.h" +#include "DNA_screen_types.h" +#include "DNA_space_types.h" #include "BLI_string.h" #include "BLT_translation.h" #include "BKE_context.h" -#include "BKE_screen.h" -#include "BKE_report.h" #include "BKE_idcode.h" +#include "BKE_report.h" +#include "BKE_screen.h" #include "RNA_access.h" @@ -48,13 +48,13 @@ #include "WM_api.h" #include "WM_types.h" -#include "ED_space_api.h" +#include "ED_outliner.h" #include "ED_screen.h" +#include "ED_space_api.h" #include "ED_view3d.h" -#include "ED_outliner.h" -#include "interface_intern.h" #include "interface_eyedropper_intern.h" +#include "interface_intern.h" /** * \note #DataDropper is only internal name to avoid confusion with other kinds of eye-droppers. diff --git a/source/blender/editors/interface/interface_eyedropper_depth.c b/source/blender/editors/interface/interface_eyedropper_depth.c index 15a9d2d9f50..a5e60adec55 100644 --- a/source/blender/editors/interface/interface_eyedropper_depth.c +++ b/source/blender/editors/interface/interface_eyedropper_depth.c @@ -28,14 +28,14 @@ #include "MEM_guardedalloc.h" -#include "DNA_space_types.h" -#include "DNA_screen_types.h" -#include "DNA_object_types.h" #include "DNA_camera_types.h" +#include "DNA_object_types.h" +#include "DNA_screen_types.h" +#include "DNA_space_types.h" #include "DNA_view3d_types.h" -#include "BLI_string.h" #include "BLI_math_vector.h" +#include "BLI_string.h" #include "BKE_context.h" #include "BKE_screen.h" @@ -54,8 +54,8 @@ #include "ED_space_api.h" #include "ED_view3d.h" -#include "interface_intern.h" #include "interface_eyedropper_intern.h" +#include "interface_intern.h" /** * \note #DepthDropper is only internal name to avoid confusion with other kinds of eye-droppers. diff --git a/source/blender/editors/interface/interface_eyedropper_driver.c b/source/blender/editors/interface/interface_eyedropper_driver.c index cc13367c190..89c087855bc 100644 --- a/source/blender/editors/interface/interface_eyedropper_driver.c +++ b/source/blender/editors/interface/interface_eyedropper_driver.c @@ -29,11 +29,11 @@ #include "MEM_guardedalloc.h" #include "DNA_anim_types.h" -#include "DNA_screen_types.h" #include "DNA_object_types.h" +#include "DNA_screen_types.h" -#include "BKE_context.h" #include "BKE_animsys.h" +#include "BKE_context.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" @@ -48,8 +48,8 @@ #include "ED_keyframing.h" -#include "interface_intern.h" #include "interface_eyedropper_intern.h" +#include "interface_intern.h" typedef struct DriverDropper { /* Destination property (i.e. where we'll add a driver) */ diff --git a/source/blender/editors/interface/interface_eyedropper_gpencil_color.c b/source/blender/editors/interface/interface_eyedropper_gpencil_color.c index f9f5c745e94..2944186c701 100644 --- a/source/blender/editors/interface/interface_eyedropper_gpencil_color.c +++ b/source/blender/editors/interface/interface_eyedropper_gpencil_color.c @@ -59,8 +59,8 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" -#include "interface_intern.h" #include "interface_eyedropper_intern.h" +#include "interface_intern.h" typedef struct EyedropperGPencil { struct ColorManagedDisplay *display; diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 27549ed60b5..238223fddfd 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -21,13 +21,13 @@ * \ingroup edinterface */ +#include <assert.h> +#include <ctype.h> #include <float.h> #include <limits.h> #include <math.h> #include <stdlib.h> #include <string.h> -#include <ctype.h> -#include <assert.h> #include "MEM_guardedalloc.h" @@ -36,29 +36,29 @@ #include "DNA_scene_types.h" #include "DNA_screen_types.h" -#include "BLI_math.h" -#include "BLI_listbase.h" #include "BLI_linklist.h" +#include "BLI_listbase.h" +#include "BLI_math.h" +#include "BLI_rect.h" #include "BLI_string.h" -#include "BLI_string_utf8.h" #include "BLI_string_cursor_utf8.h" -#include "BLI_rect.h" +#include "BLI_string_utf8.h" #include "BLI_utildefines.h" #include "PIL_time.h" -#include "BKE_colorband.h" #include "BKE_blender_undo.h" #include "BKE_brush.h" +#include "BKE_colorband.h" #include "BKE_colortools.h" #include "BKE_context.h" +#include "BKE_curveprofile.h" +#include "BKE_movieclip.h" +#include "BKE_paint.h" #include "BKE_report.h" #include "BKE_screen.h" #include "BKE_tracking.h" #include "BKE_unit.h" -#include "BKE_paint.h" -#include "BKE_curveprofile.h" -#include "BKE_movieclip.h" #include "IMB_colormanagement.h" @@ -79,9 +79,9 @@ #include "wm_event_system.h" #ifdef WITH_INPUT_IME -# include "wm_window.h" -# include "BLT_translation.h" # include "BLT_lang.h" +# include "BLT_translation.h" +# include "wm_window.h" #endif /* place the mouse at the scaled down location when un-grabbing */ diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index 1984372f398..edc5087c8dd 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -27,16 +27,16 @@ #include "MEM_guardedalloc.h" -#include "GPU_matrix.h" #include "GPU_batch.h" #include "GPU_immediate.h" +#include "GPU_matrix.h" #include "GPU_state.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_fileops_types.h" -#include "BLI_math_vector.h" #include "BLI_math_color_blend.h" +#include "BLI_math_vector.h" +#include "BLI_utildefines.h" #include "DNA_brush_types.h" #include "DNA_curve_types.h" @@ -50,11 +50,11 @@ #include "RNA_access.h" #include "RNA_enum_types.h" +#include "BKE_appdir.h" #include "BKE_context.h" #include "BKE_global.h" -#include "BKE_paint.h" #include "BKE_icons.h" -#include "BKE_appdir.h" +#include "BKE_paint.h" #include "BKE_studiolight.h" #include "IMB_imbuf.h" diff --git a/source/blender/editors/interface/interface_icons_event.c b/source/blender/editors/interface/interface_icons_event.c index 9398d1c0cd4..fed29571185 100644 --- a/source/blender/editors/interface/interface_icons_event.c +++ b/source/blender/editors/interface/interface_icons_event.c @@ -34,8 +34,8 @@ #include "GPU_state.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_math_vector.h" +#include "BLI_utildefines.h" #include "DNA_brush_types.h" #include "DNA_curve_types.h" @@ -48,8 +48,8 @@ #include "RNA_access.h" #include "RNA_enum_types.h" -#include "BKE_icons.h" #include "BKE_appdir.h" +#include "BKE_icons.h" #include "BKE_studiolight.h" #include "IMB_imbuf.h" diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c index 64ff9d02cdc..79b3c1a0a83 100644 --- a/source/blender/editors/interface/interface_layout.c +++ b/source/blender/editors/interface/interface_layout.c @@ -18,32 +18,32 @@ * \ingroup edinterface */ +#include <assert.h> #include <limits.h> #include <math.h> #include <stdlib.h> #include <string.h> -#include <assert.h> #include "MEM_guardedalloc.h" -#include "DNA_screen_types.h" #include "DNA_armature_types.h" +#include "DNA_screen_types.h" #include "DNA_userdef_types.h" #include "BLI_alloca.h" #include "BLI_listbase.h" -#include "BLI_string.h" +#include "BLI_math.h" #include "BLI_rect.h" +#include "BLI_string.h" #include "BLI_utildefines.h" -#include "BLI_math.h" #include "BLT_translation.h" +#include "BKE_animsys.h" #include "BKE_context.h" #include "BKE_global.h" #include "BKE_idprop.h" #include "BKE_screen.h" -#include "BKE_animsys.h" #include "RNA_access.h" diff --git a/source/blender/editors/interface/interface_ops.c b/source/blender/editors/interface/interface_ops.c index dce584b4ae5..7533ebd4397 100644 --- a/source/blender/editors/interface/interface_ops.c +++ b/source/blender/editors/interface/interface_ops.c @@ -26,9 +26,9 @@ #include "MEM_guardedalloc.h" #include "DNA_armature_types.h" +#include "DNA_object_types.h" /* for OB_DATA_SUPPORT_ID */ #include "DNA_screen_types.h" #include "DNA_text_types.h" -#include "DNA_object_types.h" /* for OB_DATA_SUPPORT_ID */ #include "BLI_blenlib.h" #include "BLI_math_color.h" @@ -69,9 +69,9 @@ #include "ED_keyframing.h" /* only for UI_OT_editsource */ -#include "ED_screen.h" #include "BKE_main.h" #include "BLI_ghash.h" +#include "ED_screen.h" /* -------------------------------------------------------------------- */ /** \name Copy Data Path Operator diff --git a/source/blender/editors/interface/interface_panel.c b/source/blender/editors/interface/interface_panel.c index 6e56dd96cb0..d57b4d444bd 100644 --- a/source/blender/editors/interface/interface_panel.c +++ b/source/blender/editors/interface/interface_panel.c @@ -24,10 +24,10 @@ /* a full doc with API notes can be found in * bf-blender/trunk/blender/doc/guides/interface_API.txt */ +#include <ctype.h> #include <math.h> #include <stdlib.h> #include <string.h> -#include <ctype.h> #include "MEM_guardedalloc.h" @@ -51,10 +51,10 @@ #include "ED_screen.h" -#include "UI_view2d.h" #include "UI_interface.h" #include "UI_interface_icons.h" #include "UI_resources.h" +#include "UI_view2d.h" #include "GPU_immediate.h" #include "GPU_state.h" diff --git a/source/blender/editors/interface/interface_query.c b/source/blender/editors/interface/interface_query.c index 52488027662..de68b192f67 100644 --- a/source/blender/editors/interface/interface_query.c +++ b/source/blender/editors/interface/interface_query.c @@ -20,9 +20,9 @@ * Utilities to inspect the interface, extract information. */ -#include "BLI_utildefines.h" #include "BLI_math.h" #include "BLI_rect.h" +#include "BLI_utildefines.h" #include "DNA_screen_types.h" diff --git a/source/blender/editors/interface/interface_region_color_picker.c b/source/blender/editors/interface/interface_region_color_picker.c index 917c35f0135..ecdcd575d5c 100644 --- a/source/blender/editors/interface/interface_region_color_picker.c +++ b/source/blender/editors/interface/interface_region_color_picker.c @@ -23,19 +23,19 @@ * Color Picker Region & Color Utils */ +#include <assert.h> #include <stdarg.h> #include <stdlib.h> #include <string.h> -#include <assert.h> #include "MEM_guardedalloc.h" #include "DNA_userdef_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 "BKE_context.h" diff --git a/source/blender/editors/interface/interface_region_hud.c b/source/blender/editors/interface/interface_region_hud.c index 04e6c5c24c2..f77739b5114 100644 --- a/source/blender/editors/interface/interface_region_hud.c +++ b/source/blender/editors/interface/interface_region_hud.c @@ -30,9 +30,9 @@ #include "DNA_screen_types.h" #include "DNA_userdef_types.h" -#include "BLI_string.h" -#include "BLI_rect.h" #include "BLI_listbase.h" +#include "BLI_rect.h" +#include "BLI_string.h" #include "BLI_utildefines.h" #include "BKE_context.h" @@ -51,8 +51,8 @@ #include "ED_screen.h" #include "ED_undo.h" -#include "interface_intern.h" #include "GPU_framebuffer.h" +#include "interface_intern.h" /* -------------------------------------------------------------------- */ /** \name Utilities diff --git a/source/blender/editors/interface/interface_region_menu_pie.c b/source/blender/editors/interface/interface_region_menu_pie.c index 062a8383061..1371c7524ae 100644 --- a/source/blender/editors/interface/interface_region_menu_pie.c +++ b/source/blender/editors/interface/interface_region_menu_pie.c @@ -23,10 +23,10 @@ * Pie Menu Region */ +#include <assert.h> #include <stdarg.h> #include <stdlib.h> #include <string.h> -#include <assert.h> #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/interface/interface_region_menu_popup.c b/source/blender/editors/interface/interface_region_menu_popup.c index 9ceb864b278..b3c10e8d6b8 100644 --- a/source/blender/editors/interface/interface_region_menu_popup.c +++ b/source/blender/editors/interface/interface_region_menu_popup.c @@ -23,26 +23,26 @@ * PopUp Menu Region */ +#include <assert.h> #include <stdarg.h> #include <stdlib.h> #include <string.h> -#include <assert.h> #include "MEM_guardedalloc.h" #include "DNA_userdef_types.h" -#include "BLI_math.h" #include "BLI_listbase.h" +#include "BLI_math.h" -#include "BLI_string.h" +#include "BLI_ghash.h" #include "BLI_rect.h" +#include "BLI_string.h" #include "BLI_utildefines.h" -#include "BLI_ghash.h" #include "BKE_context.h" -#include "BKE_screen.h" #include "BKE_report.h" +#include "BKE_screen.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/interface/interface_region_popover.c b/source/blender/editors/interface/interface_region_popover.c index d3cd1ebd837..b889f1d6d01 100644 --- a/source/blender/editors/interface/interface_region_popover.c +++ b/source/blender/editors/interface/interface_region_popover.c @@ -46,13 +46,13 @@ #include "BLI_listbase.h" +#include "BLI_math_vector.h" #include "BLI_rect.h" #include "BLI_utildefines.h" -#include "BLI_math_vector.h" #include "BKE_context.h" -#include "BKE_screen.h" #include "BKE_report.h" +#include "BKE_screen.h" #include "ED_screen.h" diff --git a/source/blender/editors/interface/interface_region_popup.c b/source/blender/editors/interface/interface_region_popup.c index 8db70d9a1cc..ba9a5026ce3 100644 --- a/source/blender/editors/interface/interface_region_popup.c +++ b/source/blender/editors/interface/interface_region_popup.c @@ -23,17 +23,17 @@ * PopUp Region (Generic) */ +#include <assert.h> #include <stdarg.h> #include <stdlib.h> #include <string.h> -#include <assert.h> #include "MEM_guardedalloc.h" #include "DNA_userdef_types.h" -#include "BLI_math.h" #include "BLI_listbase.h" +#include "BLI_math.h" #include "BLI_rect.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/interface/interface_region_search.c b/source/blender/editors/interface/interface_region_search.c index b10d5be5136..dab42e47e0b 100644 --- a/source/blender/editors/interface/interface_region_search.c +++ b/source/blender/editors/interface/interface_region_search.c @@ -23,10 +23,10 @@ * Search Box Region & Interaction */ +#include <assert.h> #include <stdarg.h> #include <stdlib.h> #include <string.h> -#include <assert.h> #include "MEM_guardedalloc.h" @@ -34,8 +34,8 @@ #include "BLI_math.h" -#include "BLI_string.h" #include "BLI_rect.h" +#include "BLI_string.h" #include "BLI_utildefines.h" #include "BKE_context.h" @@ -54,9 +54,9 @@ #include "ED_screen.h" +#include "GPU_state.h" #include "interface_intern.h" #include "interface_regions_intern.h" -#include "GPU_state.h" #define MENU_BORDER (int)(0.3f * U.widget_unit) diff --git a/source/blender/editors/interface/interface_region_tooltip.c b/source/blender/editors/interface/interface_region_tooltip.c index 02c69e5cef6..cf8ff51eccf 100644 --- a/source/blender/editors/interface/interface_region_tooltip.c +++ b/source/blender/editors/interface/interface_region_tooltip.c @@ -32,19 +32,19 @@ * For now it's not a priority, so leave as-is. */ +#include <assert.h> #include <stdarg.h> #include <stdlib.h> #include <string.h> -#include <assert.h> #include "MEM_guardedalloc.h" -#include "DNA_userdef_types.h" #include "DNA_brush_types.h" +#include "DNA_userdef_types.h" #include "BLI_math.h" -#include "BLI_string.h" #include "BLI_rect.h" +#include "BLI_string.h" #include "BLI_utildefines.h" #include "BKE_context.h" diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c index 6150cc43554..2275f3fecdf 100644 --- a/source/blender/editors/interface/interface_regions.c +++ b/source/blender/editors/interface/interface_regions.c @@ -25,9 +25,9 @@ * \note Most logic is now in 'interface_region_*.c' */ +#include "BLI_listbase.h" #include "BLI_utildefines.h" #include "MEM_guardedalloc.h" -#include "BLI_listbase.h" #include "BKE_context.h" #include "BKE_screen.h" diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index cb55c639d91..a1a4c15bdf6 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -19,34 +19,34 @@ */ #include <ctype.h> -#include <stdlib.h> #include <stddef.h> +#include <stdlib.h> #include <string.h> #include "MEM_guardedalloc.h" +#include "DNA_brush_types.h" #include "DNA_cachefile_types.h" #include "DNA_constraint_types.h" +#include "DNA_curveprofile_types.h" +#include "DNA_gpencil_modifier_types.h" #include "DNA_node_types.h" -#include "DNA_scene_types.h" -#include "DNA_object_types.h" #include "DNA_object_force_types.h" -#include "DNA_brush_types.h" -#include "DNA_texture_types.h" -#include "DNA_gpencil_modifier_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "DNA_shader_fx_types.h" -#include "DNA_curveprofile_types.h" +#include "DNA_texture_types.h" -#include "BLI_utildefines.h" #include "BLI_alloca.h" -#include "BLI_string.h" +#include "BLI_fnmatch.h" #include "BLI_ghash.h" -#include "BLI_rect.h" -#include "BLI_math.h" #include "BLI_listbase.h" -#include "BLI_fnmatch.h" +#include "BLI_math.h" #include "BLI_path_util.h" +#include "BLI_rect.h" +#include "BLI_string.h" #include "BLI_timecode.h" +#include "BLI_utildefines.h" #include "BLF_api.h" #include "BLT_translation.h" @@ -56,6 +56,7 @@ #include "BKE_colortools.h" #include "BKE_constraint.h" #include "BKE_context.h" +#include "BKE_curveprofile.h" #include "BKE_global.h" #include "BKE_gpencil_modifier.h" #include "BKE_idcode.h" @@ -70,7 +71,6 @@ #include "BKE_packedFile.h" #include "BKE_paint.h" #include "BKE_particle.h" -#include "BKE_curveprofile.h" #include "BKE_report.h" #include "BKE_scene.h" #include "BKE_screen.h" @@ -80,9 +80,9 @@ #include "DEG_depsgraph_build.h" #include "ED_fileselect.h" -#include "ED_screen.h" #include "ED_object.h" #include "ED_render.h" +#include "ED_screen.h" #include "ED_undo.h" #include "RNA_access.h" diff --git a/source/blender/editors/interface/interface_utils.c b/source/blender/editors/interface/interface_utils.c index 034bd906add..efa7ffb22d0 100644 --- a/source/blender/editors/interface/interface_utils.c +++ b/source/blender/editors/interface/interface_utils.c @@ -21,18 +21,18 @@ * \ingroup edinterface */ +#include <assert.h> #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <assert.h> #include "DNA_object_types.h" #include "DNA_screen_types.h" -#include "BLI_utildefines.h" +#include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_string.h" -#include "BLI_listbase.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index b61d54e6cff..7e6ef11518a 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -21,10 +21,10 @@ * \ingroup edinterface */ +#include <assert.h> #include <limits.h> #include <stdlib.h> #include <string.h> -#include <assert.h> #include "DNA_brush_types.h" #include "DNA_screen_types.h" diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index fe3f6ccd7ff..63cf2f19737 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -32,8 +32,8 @@ #include "DNA_userdef_types.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "BKE_addon.h" #include "BKE_appdir.h" @@ -49,8 +49,8 @@ #include "UI_interface.h" #include "UI_interface_icons.h" -#include "interface_intern.h" #include "GPU_framebuffer.h" +#include "interface_intern.h" /* global for themes */ typedef void (*VectorDrawFunc)(int x, int y, int w, int h, float alpha); diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c index ad2e32149d8..a93c80f02d2 100644 --- a/source/blender/editors/interface/view2d.c +++ b/source/blender/editors/interface/view2d.c @@ -32,17 +32,17 @@ #include "DNA_userdef_types.h" #include "BLI_array.h" -#include "BLI_utildefines.h" #include "BLI_link_utils.h" -#include "BLI_rect.h" #include "BLI_math.h" #include "BLI_memarena.h" -#include "BLI_timecode.h" +#include "BLI_rect.h" #include "BLI_string.h" +#include "BLI_timecode.h" +#include "BLI_utildefines.h" #include "BKE_context.h" -#include "BKE_screen.h" #include "BKE_global.h" +#include "BKE_screen.h" #include "GPU_immediate.h" #include "GPU_matrix.h" diff --git a/source/blender/editors/interface/view2d_draw.c b/source/blender/editors/interface/view2d_draw.c index b95dbe0b59d..17a95ba3fff 100644 --- a/source/blender/editors/interface/view2d_draw.c +++ b/source/blender/editors/interface/view2d_draw.c @@ -32,11 +32,11 @@ #include "DNA_userdef_types.h" #include "BLI_array.h" -#include "BLI_utildefines.h" -#include "BLI_rect.h" #include "BLI_math.h" -#include "BLI_timecode.h" +#include "BLI_rect.h" #include "BLI_string.h" +#include "BLI_timecode.h" +#include "BLI_utildefines.h" #include "GPU_immediate.h" #include "GPU_matrix.h" diff --git a/source/blender/editors/interface/view2d_gizmo_navigate.c b/source/blender/editors/interface/view2d_gizmo_navigate.c index fd309045899..8d3f1beb947 100644 --- a/source/blender/editors/interface/view2d_gizmo_navigate.c +++ b/source/blender/editors/interface/view2d_gizmo_navigate.c @@ -23,8 +23,8 @@ #include "BKE_context.h" -#include "ED_screen.h" #include "ED_gizmo_library.h" +#include "ED_screen.h" #include "UI_interface.h" #include "UI_resources.h" diff --git a/source/blender/editors/interface/view2d_ops.c b/source/blender/editors/interface/view2d_ops.c index 8116029af59..17af0cff23a 100644 --- a/source/blender/editors/interface/view2d_ops.c +++ b/source/blender/editors/interface/view2d_ops.c @@ -29,9 +29,9 @@ #include "DNA_windowmanager_types.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_math_base.h" #include "BLI_math_vector.h" +#include "BLI_utildefines.h" #include "BKE_context.h" @@ -43,8 +43,8 @@ #include "ED_screen.h" -#include "UI_view2d.h" #include "UI_interface.h" +#include "UI_view2d.h" #include "PIL_time.h" /* USER_ZOOM_CONT */ diff --git a/source/blender/editors/io/io_alembic.c b/source/blender/editors/io/io_alembic.c index 9f9e523b57b..af17303466b 100644 --- a/source/blender/editors/io/io_alembic.c +++ b/source/blender/editors/io/io_alembic.c @@ -30,8 +30,8 @@ # include "BLI_winstuff.h" # endif -# include <string.h> # include <errno.h> +# include <string.h> # include "MEM_guardedalloc.h" diff --git a/source/blender/editors/io/io_collada.c b/source/blender/editors/io/io_collada.c index 15fee4db73f..9091e7d8afc 100644 --- a/source/blender/editors/io/io_collada.c +++ b/source/blender/editors/io/io_collada.c @@ -36,8 +36,8 @@ # include "DEG_depsgraph.h" -# include "ED_screen.h" # include "ED_object.h" +# include "ED_screen.h" # include "RNA_access.h" # include "RNA_define.h" diff --git a/source/blender/editors/lattice/editlattice_select.c b/source/blender/editors/lattice/editlattice_select.c index 837c5b1c6bd..8751a289b9c 100644 --- a/source/blender/editors/lattice/editlattice_select.c +++ b/source/blender/editors/lattice/editlattice_select.c @@ -25,11 +25,11 @@ #include "MEM_guardedalloc.h" +#include "BLI_bitmap.h" #include "BLI_listbase.h" #include "BLI_math.h" -#include "BLI_utildefines.h" #include "BLI_rand.h" -#include "BLI_bitmap.h" +#include "BLI_utildefines.h" #include "DNA_curve_types.h" #include "DNA_lattice_types.h" @@ -43,13 +43,13 @@ #include "BKE_context.h" #include "BKE_lattice.h" -#include "BKE_report.h" #include "BKE_layer.h" +#include "BKE_report.h" +#include "ED_lattice.h" #include "ED_object.h" #include "ED_screen.h" #include "ED_select_utils.h" -#include "ED_lattice.h" #include "ED_view3d.h" #include "WM_api.h" diff --git a/source/blender/editors/lattice/editlattice_undo.c b/source/blender/editors/lattice/editlattice_undo.c index f90b70c492f..cfc9d162c37 100644 --- a/source/blender/editors/lattice/editlattice_undo.c +++ b/source/blender/editors/lattice/editlattice_undo.c @@ -21,16 +21,16 @@ * \ingroup edlattice */ +#include <math.h> #include <stdlib.h> #include <string.h> -#include <math.h> #include "MEM_guardedalloc.h" #include "CLG_log.h" -#include "BLI_utildefines.h" #include "BLI_array_utils.h" +#include "BLI_utildefines.h" #include "DNA_curve_types.h" #include "DNA_lattice_types.h" @@ -44,13 +44,13 @@ #include "DEG_depsgraph.h" -#include "ED_object.h" #include "ED_lattice.h" +#include "ED_object.h" #include "ED_undo.h" #include "ED_util.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" #include "lattice_intern.h" diff --git a/source/blender/editors/lattice/lattice_ops.c b/source/blender/editors/lattice/lattice_ops.c index a665d138163..d5505c00132 100644 --- a/source/blender/editors/lattice/lattice_ops.c +++ b/source/blender/editors/lattice/lattice_ops.c @@ -28,10 +28,10 @@ #include "WM_api.h" #include "WM_types.h" +#include "ED_lattice.h" +#include "ED_object.h" #include "ED_screen.h" #include "ED_select_utils.h" -#include "ED_object.h" -#include "ED_lattice.h" #include "lattice_intern.h" diff --git a/source/blender/editors/mask/mask_add.c b/source/blender/editors/mask/mask_add.c index 6299d6761e0..80716195121 100644 --- a/source/blender/editors/mask/mask_add.c +++ b/source/blender/editors/mask/mask_add.c @@ -31,16 +31,16 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" +#include "DNA_mask_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" -#include "DNA_mask_types.h" #include "WM_api.h" #include "WM_types.h" -#include "ED_select_utils.h" #include "ED_mask.h" /* own include */ #include "ED_screen.h" +#include "ED_select_utils.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/mask/mask_draw.c b/source/blender/editors/mask/mask_draw.c index 3f3bf8b7510..a532ff9e1f0 100644 --- a/source/blender/editors/mask/mask_draw.c +++ b/source/blender/editors/mask/mask_draw.c @@ -23,17 +23,17 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" +#include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_rect.h" -#include "BLI_listbase.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_mask.h" #include "DNA_mask_types.h" -#include "DNA_screen_types.h" #include "DNA_object_types.h" /* SELECT */ +#include "DNA_screen_types.h" #include "DNA_space_types.h" #include "ED_clip.h" @@ -44,8 +44,8 @@ #include "BIF_glutil.h" #include "GPU_immediate.h" -#include "GPU_shader.h" #include "GPU_matrix.h" +#include "GPU_shader.h" #include "GPU_state.h" #include "UI_interface.h" diff --git a/source/blender/editors/mask/mask_edit.c b/source/blender/editors/mask/mask_edit.c index 88cc5e33617..1606d079462 100644 --- a/source/blender/editors/mask/mask_edit.c +++ b/source/blender/editors/mask/mask_edit.c @@ -32,12 +32,12 @@ #include "WM_api.h" #include "WM_types.h" -#include "ED_screen.h" -#include "ED_select_utils.h" -#include "ED_mask.h" /* own include */ +#include "ED_clip.h" #include "ED_image.h" +#include "ED_mask.h" /* own include */ #include "ED_object.h" /* ED_keymap_proportional_maskmode only */ -#include "ED_clip.h" +#include "ED_screen.h" +#include "ED_select_utils.h" #include "ED_sequencer.h" #include "ED_transform.h" diff --git a/source/blender/editors/mask/mask_editaction.c b/source/blender/editors/mask/mask_editaction.c index 33f4bab14ec..31fc403b157 100644 --- a/source/blender/editors/mask/mask_editaction.c +++ b/source/blender/editors/mask/mask_editaction.c @@ -21,11 +21,11 @@ * \ingroup edmask */ +#include <math.h> +#include <stddef.h> #include <stdio.h> -#include <string.h> #include <stdlib.h> -#include <stddef.h> -#include <math.h> +#include <string.h> #include "MEM_guardedalloc.h" @@ -40,8 +40,8 @@ #include "ED_anim_api.h" #include "ED_keyframes_edit.h" -#include "ED_mask.h" /* own include */ #include "ED_markers.h" +#include "ED_mask.h" /* own include */ /* ***************************************** */ /* NOTE ABOUT THIS FILE: diff --git a/source/blender/editors/mask/mask_ops.c b/source/blender/editors/mask/mask_ops.c index 4d3283e608b..5e7d94dd567 100644 --- a/source/blender/editors/mask/mask_ops.c +++ b/source/blender/editors/mask/mask_ops.c @@ -33,9 +33,9 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" -#include "DNA_scene_types.h" #include "DNA_mask_types.h" #include "DNA_object_types.h" /* SELECT */ +#include "DNA_scene_types.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/mask/mask_relationships.c b/source/blender/editors/mask/mask_relationships.c index 130ebb61a90..49eb4fbd4ca 100644 --- a/source/blender/editors/mask/mask_relationships.c +++ b/source/blender/editors/mask/mask_relationships.c @@ -35,8 +35,8 @@ #include "WM_api.h" #include "WM_types.h" -#include "ED_screen.h" #include "ED_clip.h" /* frame remapping functions */ +#include "ED_screen.h" #include "mask_intern.h" /* own include */ diff --git a/source/blender/editors/mask/mask_select.c b/source/blender/editors/mask/mask_select.c index 15b3ab047ee..53ef398ccd6 100644 --- a/source/blender/editors/mask/mask_select.c +++ b/source/blender/editors/mask/mask_select.c @@ -23,10 +23,10 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" -#include "BLI_rect.h" #include "BLI_lasso_2d.h" #include "BLI_math.h" +#include "BLI_rect.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_mask.h" @@ -37,9 +37,9 @@ #include "WM_types.h" #include "ED_clip.h" +#include "ED_mask.h" /* own include */ #include "ED_screen.h" #include "ED_select_utils.h" -#include "ED_mask.h" /* own include */ #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/mask/mask_shapekey.c b/source/blender/editors/mask/mask_shapekey.c index 2300289fd3b..25b602d63c3 100644 --- a/source/blender/editors/mask/mask_shapekey.c +++ b/source/blender/editors/mask/mask_shapekey.c @@ -23,15 +23,15 @@ #include <stdlib.h> -#include "BLI_utildefines.h" #include "BLI_listbase.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_mask.h" -#include "DNA_object_types.h" #include "DNA_mask_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/mesh/editface.c b/source/blender/editors/mesh/editface.c index 5f948595a22..987447c3663 100644 --- a/source/blender/editors/mesh/editface.c +++ b/source/blender/editors/mesh/editface.c @@ -20,15 +20,15 @@ #include "MEM_guardedalloc.h" +#include "BLI_bitmap.h" #include "BLI_blenlib.h" #include "BLI_math.h" -#include "BLI_bitmap.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" -#include "DNA_meshdata_types.h" #include "DNA_mesh_types.h" +#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "BKE_context.h" diff --git a/source/blender/editors/mesh/editmesh_add.c b/source/blender/editors/mesh/editmesh_add.c index 7a0124e72bb..1484dcfa92d 100644 --- a/source/blender/editors/mesh/editmesh_add.c +++ b/source/blender/editors/mesh/editmesh_add.c @@ -33,15 +33,15 @@ #include "BKE_context.h" #include "BKE_editmesh.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" #include "WM_api.h" #include "WM_types.h" #include "ED_mesh.h" -#include "ED_screen.h" #include "ED_object.h" +#include "ED_screen.h" #include "ED_uvedit.h" #include "mesh_intern.h" /* own include */ diff --git a/source/blender/editors/mesh/editmesh_bevel.c b/source/blender/editors/mesh/editmesh_bevel.c index 123672a977b..10c290e2be9 100644 --- a/source/blender/editors/mesh/editmesh_bevel.c +++ b/source/blender/editors/mesh/editmesh_bevel.c @@ -22,24 +22,24 @@ #include "DNA_object_types.h" -#include "BLI_string.h" #include "BLI_math.h" +#include "BLI_string.h" #include "BLT_translation.h" #include "BKE_context.h" -#include "BKE_global.h" +#include "BKE_curveprofile.h" #include "BKE_editmesh.h" -#include "BKE_unit.h" +#include "BKE_global.h" #include "BKE_layer.h" #include "BKE_mesh.h" -#include "BKE_curveprofile.h" +#include "BKE_unit.h" -#include "DNA_mesh_types.h" #include "DNA_curveprofile_types.h" +#include "DNA_mesh_types.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/mesh/editmesh_bisect.c b/source/blender/editors/mesh/editmesh_bisect.c index e0a4195a668..bc8c456889d 100644 --- a/source/blender/editors/mesh/editmesh_bisect.c +++ b/source/blender/editors/mesh/editmesh_bisect.c @@ -29,22 +29,22 @@ #include "BLT_translation.h" -#include "BKE_global.h" #include "BKE_context.h" #include "BKE_editmesh.h" +#include "BKE_global.h" #include "BKE_layer.h" #include "BKE_report.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" #include "WM_api.h" #include "WM_types.h" +#include "ED_gizmo_utils.h" #include "ED_mesh.h" #include "ED_screen.h" #include "ED_view3d.h" -#include "ED_gizmo_utils.h" #include "UI_resources.h" diff --git a/source/blender/editors/mesh/editmesh_extrude.c b/source/blender/editors/mesh/editmesh_extrude.c index 3e79b7f1b9d..1ea1501fc66 100644 --- a/source/blender/editors/mesh/editmesh_extrude.c +++ b/source/blender/editors/mesh/editmesh_extrude.c @@ -24,19 +24,19 @@ #include "DNA_modifier_types.h" #include "DNA_object_types.h" -#include "BLI_math.h" #include "BLI_listbase.h" +#include "BLI_math.h" -#include "BKE_layer.h" #include "BKE_context.h" -#include "BKE_report.h" #include "BKE_editmesh.h" +#include "BKE_layer.h" +#include "BKE_report.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" #include "ED_mesh.h" #include "ED_screen.h" diff --git a/source/blender/editors/mesh/editmesh_extrude_screw.c b/source/blender/editors/mesh/editmesh_extrude_screw.c index ef393acdb4e..4cffd12cb34 100644 --- a/source/blender/editors/mesh/editmesh_extrude_screw.c +++ b/source/blender/editors/mesh/editmesh_extrude_screw.c @@ -32,8 +32,8 @@ #include "BKE_layer.h" #include "BKE_report.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" #include "WM_types.h" diff --git a/source/blender/editors/mesh/editmesh_extrude_spin.c b/source/blender/editors/mesh/editmesh_extrude_spin.c index 69274f77049..9f1d499bb6a 100644 --- a/source/blender/editors/mesh/editmesh_extrude_spin.c +++ b/source/blender/editors/mesh/editmesh_extrude_spin.c @@ -26,12 +26,12 @@ #include "BLI_math.h" #include "BKE_context.h" -#include "BKE_report.h" #include "BKE_editmesh.h" #include "BKE_layer.h" +#include "BKE_report.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" #include "RNA_enum_types.h" #include "WM_api.h" diff --git a/source/blender/editors/mesh/editmesh_extrude_spin_gizmo.c b/source/blender/editors/mesh/editmesh_extrude_spin_gizmo.c index 979c59632e1..75a36b68f8b 100644 --- a/source/blender/editors/mesh/editmesh_extrude_spin_gizmo.c +++ b/source/blender/editors/mesh/editmesh_extrude_spin_gizmo.c @@ -23,14 +23,14 @@ #include "BKE_context.h" #include "BKE_scene.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" #include "RNA_enum_types.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" #include "WM_toolsystem.h" +#include "WM_types.h" #include "ED_gizmo_utils.h" #include "ED_screen.h" diff --git a/source/blender/editors/mesh/editmesh_inset.c b/source/blender/editors/mesh/editmesh_inset.c index ea1942dee5f..f2983f06da6 100644 --- a/source/blender/editors/mesh/editmesh_inset.c +++ b/source/blender/editors/mesh/editmesh_inset.c @@ -22,19 +22,19 @@ #include "DNA_object_types.h" -#include "BLI_string.h" #include "BLI_math.h" +#include "BLI_string.h" #include "BLT_translation.h" #include "BKE_context.h" -#include "BKE_global.h" #include "BKE_editmesh.h" -#include "BKE_unit.h" +#include "BKE_global.h" #include "BKE_layer.h" +#include "BKE_unit.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/mesh/editmesh_intersect.c b/source/blender/editors/mesh/editmesh_intersect.c index 847a8ecacc3..7718a07a55e 100644 --- a/source/blender/editors/mesh/editmesh_intersect.c +++ b/source/blender/editors/mesh/editmesh_intersect.c @@ -22,17 +22,17 @@ #include "DNA_object_types.h" +#include "BLI_buffer.h" +#include "BLI_linklist_stack.h" #include "BLI_math.h" #include "BLI_memarena.h" #include "BLI_stack.h" -#include "BLI_buffer.h" -#include "BLI_linklist_stack.h" -#include "BKE_layer.h" -#include "BKE_editmesh_bvh.h" #include "BKE_context.h" -#include "BKE_report.h" #include "BKE_editmesh.h" +#include "BKE_editmesh_bvh.h" +#include "BKE_layer.h" +#include "BKE_report.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c index b951c06ba8c..6230eacba94 100644 --- a/source/blender/editors/mesh/editmesh_knife.c +++ b/source/blender/editors/mesh/editmesh_knife.c @@ -29,14 +29,14 @@ #include "MEM_guardedalloc.h" -#include "BLI_listbase.h" -#include "BLI_string.h" -#include "BLI_array.h" #include "BLI_alloca.h" +#include "BLI_array.h" #include "BLI_linklist.h" +#include "BLI_listbase.h" #include "BLI_math.h" -#include "BLI_smallhash.h" #include "BLI_memarena.h" +#include "BLI_smallhash.h" +#include "BLI_string.h" #include "BLT_translation.h" @@ -50,10 +50,10 @@ #include "GPU_matrix.h" #include "GPU_state.h" +#include "ED_mesh.h" #include "ED_screen.h" #include "ED_space_api.h" #include "ED_view3d.h" -#include "ED_mesh.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/mesh/editmesh_knife_project.c b/source/blender/editors/mesh/editmesh_knife_project.c index ce0d5d9f7a7..10e8bfa529f 100644 --- a/source/blender/editors/mesh/editmesh_knife_project.c +++ b/source/blender/editors/mesh/editmesh_knife_project.c @@ -24,14 +24,14 @@ #include "DNA_curve_types.h" #include "DNA_object_types.h" -#include "BLI_math.h" #include "BLI_linklist.h" #include "BLI_listbase.h" +#include "BLI_math.h" -#include "BKE_mesh.h" #include "BKE_context.h" #include "BKE_curve.h" #include "BKE_editmesh.h" +#include "BKE_mesh.h" #include "BKE_mesh_runtime.h" #include "BKE_object.h" #include "BKE_report.h" @@ -39,8 +39,8 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/mesh/editmesh_loopcut.c b/source/blender/editors/mesh/editmesh_loopcut.c index 066b692e1ff..37bacb4af55 100644 --- a/source/blender/editors/mesh/editmesh_loopcut.c +++ b/source/blender/editors/mesh/editmesh_loopcut.c @@ -25,27 +25,27 @@ #include "MEM_guardedalloc.h" -#include "BLI_string.h" #include "BLI_math.h" +#include "BLI_string.h" #include "BLT_translation.h" #include "DNA_mesh_types.h" #include "BKE_context.h" +#include "BKE_editmesh.h" +#include "BKE_layer.h" #include "BKE_modifier.h" #include "BKE_report.h" -#include "BKE_editmesh.h" #include "BKE_unit.h" -#include "BKE_layer.h" #include "UI_interface.h" +#include "ED_mesh.h" +#include "ED_numinput.h" #include "ED_screen.h" #include "ED_space_api.h" #include "ED_view3d.h" -#include "ED_mesh.h" -#include "ED_numinput.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/mesh/editmesh_mask_extract.c b/source/blender/editors/mesh/editmesh_mask_extract.c index cd91aa1e491..3a0a028468d 100644 --- a/source/blender/editors/mesh/editmesh_mask_extract.c +++ b/source/blender/editors/mesh/editmesh_mask_extract.c @@ -40,15 +40,15 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" #include "ED_mesh.h" -#include "ED_screen.h" #include "ED_object.h" +#include "ED_screen.h" #include "ED_sculpt.h" #include "ED_view3d.h" diff --git a/source/blender/editors/mesh/editmesh_path.c b/source/blender/editors/mesh/editmesh_path.c index e09bcaf4edc..7cde233c6b6 100644 --- a/source/blender/editors/mesh/editmesh_path.c +++ b/source/blender/editors/mesh/editmesh_path.c @@ -23,25 +23,25 @@ #include "MEM_guardedalloc.h" -#include "DNA_scene_types.h" -#include "DNA_object_types.h" #include "DNA_mesh_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "DNA_windowmanager_types.h" #ifdef WITH_FREESTYLE # include "DNA_meshdata_types.h" #endif -#include "BLI_math.h" #include "BLI_linklist.h" +#include "BLI_math.h" -#include "BKE_layer.h" #include "BKE_context.h" #include "BKE_editmesh.h" +#include "BKE_layer.h" #include "BKE_report.h" -#include "ED_object.h" #include "ED_mesh.h" +#include "ED_object.h" #include "ED_screen.h" #include "ED_uvedit.h" #include "ED_view3d.h" diff --git a/source/blender/editors/mesh/editmesh_polybuild.c b/source/blender/editors/mesh/editmesh_polybuild.c index fac0fc72c0b..c7bb45ccfe3 100644 --- a/source/blender/editors/mesh/editmesh_polybuild.c +++ b/source/blender/editors/mesh/editmesh_polybuild.c @@ -28,15 +28,15 @@ #include "BLI_math.h" #include "BKE_context.h" -#include "BKE_report.h" #include "BKE_editmesh.h" -#include "BKE_mesh.h" #include "BKE_layer.h" +#include "BKE_mesh.h" +#include "BKE_report.h" #include "WM_types.h" -#include "ED_object.h" #include "ED_mesh.h" +#include "ED_object.h" #include "ED_scene.h" #include "ED_screen.h" #include "ED_transform.h" diff --git a/source/blender/editors/mesh/editmesh_preselect_edgering.c b/source/blender/editors/mesh/editmesh_preselect_edgering.c index 92a8c7da71d..50af79fc5e1 100644 --- a/source/blender/editors/mesh/editmesh_preselect_edgering.c +++ b/source/blender/editors/mesh/editmesh_preselect_edgering.c @@ -20,8 +20,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_stack.h" #include "BLI_math.h" +#include "BLI_stack.h" #include "BKE_editmesh.h" diff --git a/source/blender/editors/mesh/editmesh_rip.c b/source/blender/editors/mesh/editmesh_rip.c index 3fa6569e3e9..a1ea6074044 100644 --- a/source/blender/editors/mesh/editmesh_rip.c +++ b/source/blender/editors/mesh/editmesh_rip.c @@ -25,16 +25,16 @@ #include "DNA_object_types.h" -#include "BLI_math.h" #include "BLI_array.h" +#include "BLI_math.h" #include "BKE_context.h" -#include "BKE_report.h" #include "BKE_editmesh.h" #include "BKE_layer.h" +#include "BKE_report.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" #include "WM_types.h" diff --git a/source/blender/editors/mesh/editmesh_rip_edge.c b/source/blender/editors/mesh/editmesh_rip_edge.c index e2aca1e6831..6775cb85ef9 100644 --- a/source/blender/editors/mesh/editmesh_rip_edge.c +++ b/source/blender/editors/mesh/editmesh_rip_edge.c @@ -27,9 +27,9 @@ #include "BLI_math.h" #include "BKE_context.h" -#include "BKE_report.h" #include "BKE_editmesh.h" #include "BKE_layer.h" +#include "BKE_report.h" #include "WM_types.h" diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c index 1635aa72ee0..f01511fa513 100644 --- a/source/blender/editors/mesh/editmesh_select.c +++ b/source/blender/editors/mesh/editmesh_select.c @@ -23,21 +23,21 @@ #include "MEM_guardedalloc.h" +#include "BLI_array.h" #include "BLI_bitmap.h" -#include "BLI_listbase.h" +#include "BLI_heap.h" #include "BLI_linklist.h" #include "BLI_linklist_stack.h" +#include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_math_bits.h" #include "BLI_rand.h" -#include "BLI_array.h" -#include "BLI_heap.h" #include "BLI_utildefines_stack.h" #include "BKE_context.h" -#include "BKE_report.h" #include "BKE_editmesh.h" #include "BKE_layer.h" +#include "BKE_report.h" #include "WM_api.h" #include "WM_types.h" @@ -46,11 +46,11 @@ #include "RNA_define.h" #include "RNA_enum_types.h" -#include "ED_object.h" #include "ED_mesh.h" +#include "ED_object.h" #include "ED_screen.h" -#include "ED_transform.h" #include "ED_select_utils.h" +#include "ED_transform.h" #include "ED_view3d.h" #include "DNA_mesh_types.h" diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 3a1781b941a..b52f63e0a1b 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -35,17 +35,17 @@ #include "BLI_bitmap.h" #include "BLI_heap_simple.h" -#include "BLI_listbase.h" #include "BLI_linklist.h" #include "BLI_linklist_stack.h" +#include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_rand.h" #include "BLI_sort_utils.h" #include "BLI_string.h" -#include "BKE_editmesh.h" #include "BKE_context.h" #include "BKE_deform.h" +#include "BKE_editmesh.h" #include "BKE_key.h" #include "BKE_layer.h" #include "BKE_lib_id.h" @@ -60,8 +60,8 @@ #include "BLT_translation.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" #include "RNA_enum_types.h" #include "WM_api.h" diff --git a/source/blender/editors/mesh/editmesh_undo.c b/source/blender/editors/mesh/editmesh_undo.c index 951efdc6127..1f857ad4710 100644 --- a/source/blender/editors/mesh/editmesh_undo.c +++ b/source/blender/editors/mesh/editmesh_undo.c @@ -22,32 +22,32 @@ #include "CLG_log.h" +#include "DNA_key_types.h" +#include "DNA_layer_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" -#include "DNA_key_types.h" -#include "DNA_layer_types.h" -#include "BLI_listbase.h" #include "BLI_array_utils.h" +#include "BLI_listbase.h" #include "BKE_context.h" +#include "BKE_editmesh.h" #include "BKE_key.h" #include "BKE_layer.h" #include "BKE_main.h" #include "BKE_mesh.h" -#include "BKE_editmesh.h" #include "BKE_undo_system.h" #include "DEG_depsgraph.h" -#include "ED_object.h" #include "ED_mesh.h" -#include "ED_util.h" +#include "ED_object.h" #include "ED_undo.h" +#include "ED_util.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" #define USE_ARRAY_STORE diff --git a/source/blender/editors/mesh/editmesh_utils.c b/source/blender/editors/mesh/editmesh_utils.c index d281dc46b2c..f44a94a63f8 100644 --- a/source/blender/editors/mesh/editmesh_utils.c +++ b/source/blender/editors/mesh/editmesh_utils.c @@ -23,25 +23,25 @@ #include "MEM_guardedalloc.h" +#include "DNA_key_types.h" #include "DNA_mesh_types.h" #include "DNA_object_types.h" -#include "DNA_key_types.h" -#include "BLI_math.h" #include "BLI_alloca.h" #include "BLI_buffer.h" #include "BLI_kdtree.h" #include "BLI_listbase.h" +#include "BLI_math.h" #include "BKE_DerivedMesh.h" #include "BKE_context.h" +#include "BKE_editmesh.h" +#include "BKE_editmesh_bvh.h" +#include "BKE_global.h" #include "BKE_main.h" #include "BKE_mesh.h" #include "BKE_mesh_mapping.h" #include "BKE_report.h" -#include "BKE_editmesh.h" -#include "BKE_editmesh_bvh.h" -#include "BKE_global.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/mesh/mesh_data.c b/source/blender/editors/mesh/mesh_data.c index 7007ff29401..51b699acd63 100644 --- a/source/blender/editors/mesh/mesh_data.c +++ b/source/blender/editors/mesh/mesh_data.c @@ -29,9 +29,9 @@ #include "DNA_scene_types.h" #include "DNA_view3d_types.h" -#include "BLI_utildefines.h" #include "BLI_alloca.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_editmesh.h" diff --git a/source/blender/editors/mesh/mesh_mirror.c b/source/blender/editors/mesh/mesh_mirror.c index 628c8273bc5..9b599d8df7f 100644 --- a/source/blender/editors/mesh/mesh_mirror.c +++ b/source/blender/editors/mesh/mesh_mirror.c @@ -29,8 +29,8 @@ #include "DNA_object_types.h" #include "BKE_editmesh.h" -#include "BLI_kdtree.h" #include "BKE_mesh.h" +#include "BLI_kdtree.h" #include "ED_mesh.h" diff --git a/source/blender/editors/mesh/mesh_ops.c b/source/blender/editors/mesh/mesh_ops.c index d467a963799..c61fe39b5fd 100644 --- a/source/blender/editors/mesh/mesh_ops.c +++ b/source/blender/editors/mesh/mesh_ops.c @@ -21,16 +21,16 @@ * \ingroup edmesh */ -#include "DNA_scene_types.h" #include "DNA_modifier_types.h" +#include "DNA_scene_types.h" #include "RNA_access.h" #include "WM_api.h" #include "WM_types.h" -#include "ED_object.h" #include "ED_mesh.h" +#include "ED_object.h" #include "ED_screen.h" #include "ED_select_utils.h" diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c index 8f31fa0a1fa..6c5106d3eec 100644 --- a/source/blender/editors/mesh/meshtools.c +++ b/source/blender/editors/mesh/meshtools.c @@ -37,8 +37,8 @@ #include "DNA_view3d_types.h" #include "DNA_workspace_types.h" -#include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_math.h" #include "BKE_context.h" #include "BKE_deform.h" diff --git a/source/blender/editors/metaball/editmball_undo.c b/source/blender/editors/metaball/editmball_undo.c index 165db6c5a06..552e459acb1 100644 --- a/source/blender/editors/metaball/editmball_undo.c +++ b/source/blender/editors/metaball/editmball_undo.c @@ -25,9 +25,9 @@ #include "CLG_log.h" -#include "BLI_utildefines.h" -#include "BLI_listbase.h" #include "BLI_array_utils.h" +#include "BLI_listbase.h" +#include "BLI_utildefines.h" #include "DNA_defs.h" #include "DNA_meta_types.h" @@ -40,13 +40,13 @@ #include "DEG_depsgraph.h" -#include "ED_object.h" #include "ED_mball.h" +#include "ED_object.h" #include "ED_undo.h" #include "ED_util.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" /** We only need this locally. */ static CLG_LogRef LOG = {"ed.undo.mball"}; diff --git a/source/blender/editors/metaball/mball_edit.c b/source/blender/editors/metaball/mball_edit.c index 64ae75a0ee8..a64674deda4 100644 --- a/source/blender/editors/metaball/mball_edit.c +++ b/source/blender/editors/metaball/mball_edit.c @@ -27,22 +27,22 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" +#include "BLI_kdtree.h" #include "BLI_math.h" #include "BLI_rand.h" #include "BLI_utildefines.h" -#include "BLI_kdtree.h" #include "DNA_defs.h" #include "DNA_meta_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" #include "BKE_context.h" -#include "BKE_mball.h" #include "BKE_layer.h" +#include "BKE_mball.h" #include "BKE_object.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/metaball/mball_ops.c b/source/blender/editors/metaball/mball_ops.c index c203ca56d74..100ca4691ca 100644 --- a/source/blender/editors/metaball/mball_ops.c +++ b/source/blender/editors/metaball/mball_ops.c @@ -29,9 +29,9 @@ #include "WM_types.h" #include "ED_mball.h" +#include "ED_object.h" #include "ED_screen.h" #include "ED_select_utils.h" -#include "ED_object.h" #include "mball_intern.h" diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 832854ec4cc..576e8e0ec25 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -21,9 +21,9 @@ * \ingroup edobj */ +#include <ctype.h> #include <stdlib.h> #include <string.h> -#include <ctype.h> #include "MEM_guardedalloc.h" @@ -31,24 +31,24 @@ #include "DNA_camera_types.h" #include "DNA_collection_types.h" #include "DNA_curve_types.h" -#include "DNA_light_types.h" +#include "DNA_gpencil_types.h" #include "DNA_key_types.h" +#include "DNA_light_types.h" +#include "DNA_lightprobe_types.h" #include "DNA_material_types.h" #include "DNA_mesh_types.h" #include "DNA_meta_types.h" #include "DNA_object_fluidsim_types.h" #include "DNA_object_force_types.h" #include "DNA_object_types.h" -#include "DNA_lightprobe_types.h" #include "DNA_scene_types.h" #include "DNA_vfont_types.h" -#include "DNA_gpencil_types.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" @@ -58,8 +58,8 @@ #include "BKE_armature.h" #include "BKE_camera.h" #include "BKE_collection.h" -#include "BKE_context.h" #include "BKE_constraint.h" +#include "BKE_context.h" #include "BKE_curve.h" #include "BKE_displist.h" #include "BKE_effect.h" @@ -67,12 +67,12 @@ #include "BKE_gpencil.h" #include "BKE_hair.h" #include "BKE_key.h" -#include "BKE_light.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_main.h" #include "BKE_material.h" diff --git a/source/blender/editors/object/object_bake.c b/source/blender/editors/object/object_bake.c index 6f659858ac2..2cb0229126d 100644 --- a/source/blender/editors/object/object_bake.c +++ b/source/blender/editors/object/object_bake.c @@ -25,40 +25,40 @@ #include "MEM_guardedalloc.h" +#include "DNA_mesh_types.h" +#include "DNA_meshdata_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" #include "DNA_space_types.h" #include "DNA_world_types.h" -#include "DNA_object_types.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "BLI_blenlib.h" #include "BLI_utildefines.h" +#include "BKE_DerivedMesh.h" #include "BKE_blender.h" +#include "BKE_cdderivedmesh.h" #include "BKE_context.h" #include "BKE_global.h" #include "BKE_image.h" #include "BKE_material.h" +#include "BKE_mesh.h" +#include "BKE_modifier.h" #include "BKE_multires.h" #include "BKE_report.h" -#include "BKE_cdderivedmesh.h" -#include "BKE_modifier.h" -#include "BKE_DerivedMesh.h" -#include "BKE_mesh.h" #include "BKE_scene.h" #include "DEG_depsgraph.h" +#include "RE_multires_bake.h" #include "RE_pipeline.h" #include "RE_shader_ext.h" -#include "RE_multires_bake.h" #include "PIL_time.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "GPU_draw.h" /* GPU_free_image */ diff --git a/source/blender/editors/object/object_bake_api.c b/source/blender/editors/object/object_bake_api.c index 8cfcad2d77e..7d39d2546b6 100644 --- a/source/blender/editors/object/object_bake_api.c +++ b/source/blender/editors/object/object_bake_api.c @@ -23,16 +23,16 @@ #include "MEM_guardedalloc.h" -#include "DNA_object_types.h" -#include "DNA_mesh_types.h" #include "DNA_material_types.h" +#include "DNA_mesh_types.h" +#include "DNA_object_types.h" #include "RNA_access.h" #include "RNA_define.h" #include "RNA_enum_types.h" -#include "BLI_listbase.h" #include "BLI_fileops.h" +#include "BLI_listbase.h" #include "BLI_path_util.h" #include "BKE_context.h" @@ -57,9 +57,9 @@ #include "RE_engine.h" #include "RE_pipeline.h" -#include "IMB_imbuf_types.h" -#include "IMB_imbuf.h" #include "IMB_colormanagement.h" +#include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/object/object_collection.c b/source/blender/editors/object/object_collection.c index a278ce90eda..7c12a4839f0 100644 --- a/source/blender/editors/object/object_collection.c +++ b/source/blender/editors/object/object_collection.c @@ -40,8 +40,8 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" -#include "ED_screen.h" #include "ED_object.h" +#include "ED_screen.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/object/object_constraint.c b/source/blender/editors/object/object_constraint.c index 4db7ee9594e..d9fb48afcbf 100644 --- a/source/blender/editors/object/object_constraint.c +++ b/source/blender/editors/object/object_constraint.c @@ -27,8 +27,8 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_math.h" #include "BLI_dynstr.h" +#include "BLI_math.h" #include "BLI_utildefines.h" #include "BLT_translation.h" @@ -37,10 +37,11 @@ #include "DNA_armature_types.h" #include "DNA_constraint_types.h" #include "DNA_curve_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_text_types.h" -#include "DNA_object_types.h" +#include "BIK_api.h" #include "BKE_action.h" #include "BKE_armature.h" #include "BKE_constraint.h" @@ -50,7 +51,6 @@ #include "BKE_object.h" #include "BKE_report.h" #include "BKE_tracking.h" -#include "BIK_api.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" @@ -67,8 +67,8 @@ #include "RNA_define.h" #include "RNA_enum_types.h" -#include "ED_object.h" #include "ED_keyframing.h" +#include "ED_object.h" #include "ED_screen.h" #include "UI_interface.h" diff --git a/source/blender/editors/object/object_data_transfer.c b/source/blender/editors/object/object_data_transfer.c index 0a5db782892..1e2b7702dc5 100644 --- a/source/blender/editors/object/object_data_transfer.c +++ b/source/blender/editors/object/object_data_transfer.c @@ -26,8 +26,8 @@ #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_context.h" diff --git a/source/blender/editors/object/object_data_transform.c b/source/blender/editors/object/object_data_transform.c index 6d03ec2774c..fc91cbb9666 100644 --- a/source/blender/editors/object/object_data_transform.c +++ b/source/blender/editors/object/object_data_transform.c @@ -32,23 +32,23 @@ #include "DNA_anim_types.h" #include "DNA_armature_types.h" +#include "DNA_collection_types.h" +#include "DNA_lattice_types.h" #include "DNA_mesh_types.h" #include "DNA_meta_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_collection_types.h" -#include "DNA_lattice_types.h" -#include "BLI_math.h" #include "BLI_listbase.h" +#include "BLI_math.h" #include "BLI_utildefines.h" +#include "BKE_armature.h" #include "BKE_curve.h" #include "BKE_editmesh.h" +#include "BKE_lattice.h" #include "BKE_mball.h" #include "BKE_mesh.h" -#include "BKE_armature.h" -#include "BKE_lattice.h" #include "BKE_scene.h" #include "bmesh.h" @@ -58,9 +58,9 @@ #include "WM_types.h" -#include "ED_object.h" -#include "ED_mesh.h" #include "ED_armature.h" +#include "ED_mesh.h" +#include "ED_object.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index def93db2537..7faad5cdd0e 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -21,19 +21,19 @@ * \ingroup edobj */ +#include <ctype.h> +#include <float.h> +#include <math.h> +#include <stddef.h> //for offsetof #include <stdlib.h> #include <string.h> -#include <math.h> #include <time.h> -#include <float.h> -#include <ctype.h> -#include <stddef.h> //for offsetof #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" @@ -41,15 +41,15 @@ #include "DNA_collection_types.h" #include "DNA_curve_types.h" #include "DNA_gpencil_types.h" +#include "DNA_lattice_types.h" #include "DNA_material_types.h" +#include "DNA_mesh_types.h" +#include "DNA_meshdata_types.h" #include "DNA_meta_types.h" -#include "DNA_scene_types.h" -#include "DNA_object_types.h" #include "DNA_object_force_types.h" -#include "DNA_meshdata_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "DNA_vfont_types.h" -#include "DNA_mesh_types.h" -#include "DNA_lattice_types.h" #include "DNA_workspace_types.h" #include "IMB_imbuf_types.h" @@ -60,6 +60,7 @@ #include "BKE_context.h" #include "BKE_curve.h" #include "BKE_editlattice.h" +#include "BKE_editmesh.h" #include "BKE_effect.h" #include "BKE_global.h" #include "BKE_image.h" @@ -74,10 +75,9 @@ #include "BKE_paint.h" #include "BKE_particle.h" #include "BKE_pointcache.h" -#include "BKE_softbody.h" -#include "BKE_editmesh.h" #include "BKE_report.h" #include "BKE_scene.h" +#include "BKE_softbody.h" #include "BKE_workspace.h" #include "DEG_depsgraph.h" @@ -86,15 +86,15 @@ #include "ED_anim_api.h" #include "ED_armature.h" #include "ED_curve.h" -#include "ED_mesh.h" -#include "ED_mball.h" +#include "ED_gpencil.h" +#include "ED_image.h" #include "ED_lattice.h" +#include "ED_mball.h" +#include "ED_mesh.h" #include "ED_object.h" #include "ED_outliner.h" #include "ED_screen.h" #include "ED_undo.h" -#include "ED_image.h" -#include "ED_gpencil.h" #include "RNA_access.h" #include "RNA_define.h" @@ -106,9 +106,9 @@ #include "UI_resources.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" #include "WM_toolsystem.h" +#include "WM_types.h" #include "object_intern.h" // own include diff --git a/source/blender/editors/object/object_facemap_ops.c b/source/blender/editors/object/object_facemap_ops.c index 0081e18f33c..147bd3d7871 100644 --- a/source/blender/editors/object/object_facemap_ops.c +++ b/source/blender/editors/object/object_facemap_ops.c @@ -25,27 +25,27 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_listbase.h" +#include "BLI_utildefines.h" -#include "DNA_object_types.h" #include "DNA_mesh_types.h" +#include "DNA_object_types.h" #include "DNA_workspace_types.h" #include "BKE_context.h" #include "BKE_customdata.h" #include "BKE_editmesh.h" #include "BKE_object.h" -#include "BKE_object_facemap.h" #include "BKE_object_deform.h" +#include "BKE_object_facemap.h" #include "DEG_depsgraph.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" #include "ED_mesh.h" #include "ED_object.h" diff --git a/source/blender/editors/object/object_gpencil_modifier.c b/source/blender/editors/object/object_gpencil_modifier.c index 4543f1a19b3..5bf5c4bd95a 100644 --- a/source/blender/editors/object/object_gpencil_modifier.c +++ b/source/blender/editors/object/object_gpencil_modifier.c @@ -27,8 +27,8 @@ #include "MEM_guardedalloc.h" -#include "DNA_gpencil_types.h" #include "DNA_gpencil_modifier_types.h" +#include "DNA_gpencil_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" @@ -37,11 +37,11 @@ #include "BLI_utildefines.h" #include "BKE_context.h" -#include "BKE_main.h" +#include "BKE_gpencil.h" #include "BKE_gpencil_modifier.h" -#include "BKE_report.h" +#include "BKE_main.h" #include "BKE_object.h" -#include "BKE_gpencil.h" +#include "BKE_report.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" diff --git a/source/blender/editors/object/object_hook.c b/source/blender/editors/object/object_hook.c index 3c722ffc749..4414acff115 100644 --- a/source/blender/editors/object/object_hook.c +++ b/source/blender/editors/object/object_hook.c @@ -26,8 +26,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_listbase.h" +#include "BLI_math.h" #include "BLI_string.h" #include "BLI_utildefines.h" @@ -41,29 +41,29 @@ #include "BKE_action.h" #include "BKE_context.h" +#include "BKE_deform.h" +#include "BKE_editmesh.h" #include "BKE_layer.h" #include "BKE_main.h" #include "BKE_modifier.h" #include "BKE_object.h" #include "BKE_report.h" #include "BKE_scene.h" -#include "BKE_deform.h" -#include "BKE_editmesh.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" #include "DEG_depsgraph_query.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" #include "RNA_enum_types.h" #include "ED_curve.h" #include "ED_mesh.h" #include "ED_screen.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" #include "UI_resources.h" diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index 7c74213608c..f2629b0b02f 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -37,17 +37,17 @@ #include "DNA_scene_types.h" #include "BLI_bitmap.h" -#include "BLI_math.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_path_util.h" #include "BLI_utildefines.h" +#include "BKE_DerivedMesh.h" #include "BKE_animsys.h" -#include "BKE_curve.h" #include "BKE_context.h" -#include "BKE_DerivedMesh.h" +#include "BKE_curve.h" #include "BKE_displist.h" #include "BKE_editmesh.h" #include "BKE_effect.h" @@ -83,9 +83,9 @@ #include "RNA_enum_types.h" #include "ED_armature.h" +#include "ED_mesh.h" #include "ED_object.h" #include "ED_screen.h" -#include "ED_mesh.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/object/object_ops.c b/source/blender/editors/object/object_ops.c index 52273b887dd..cacf7b67777 100644 --- a/source/blender/editors/object/object_ops.c +++ b/source/blender/editors/object/object_ops.c @@ -21,8 +21,8 @@ * \ingroup edobj */ -#include <stdlib.h> #include <math.h> +#include <stdlib.h> #include "DNA_object_types.h" #include "DNA_scene_types.h" @@ -37,9 +37,9 @@ #include "WM_api.h" #include "WM_types.h" +#include "ED_object.h" #include "ED_screen.h" #include "ED_select_utils.h" -#include "ED_object.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index 836e3bf7a44..f86ad1216cb 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -33,8 +33,8 @@ #include "DNA_collection_types.h" #include "DNA_constraint_types.h" #include "DNA_gpencil_types.h" -#include "DNA_light_types.h" #include "DNA_lattice_types.h" +#include "DNA_light_types.h" #include "DNA_material_types.h" #include "DNA_mesh_types.h" #include "DNA_meta_types.h" @@ -44,37 +44,37 @@ #include "DNA_vfont_types.h" #include "DNA_world_types.h" -#include "BLI_math.h" -#include "BLI_listbase.h" +#include "BLI_kdtree.h" #include "BLI_linklist.h" +#include "BLI_listbase.h" +#include "BLI_math.h" #include "BLI_string.h" -#include "BLI_kdtree.h" #include "BLI_utildefines.h" #include "BLT_translation.h" +#include "BKE_DerivedMesh.h" #include "BKE_action.h" #include "BKE_animsys.h" #include "BKE_armature.h" #include "BKE_camera.h" #include "BKE_collection.h" -#include "BKE_context.h" #include "BKE_constraint.h" +#include "BKE_context.h" #include "BKE_curve.h" -#include "BKE_DerivedMesh.h" #include "BKE_displist.h" #include "BKE_editmesh.h" -#include "BKE_gpencil.h" #include "BKE_fcurve.h" +#include "BKE_gpencil.h" #include "BKE_hair.h" #include "BKE_idprop.h" -#include "BKE_light.h" #include "BKE_lattice.h" #include "BKE_layer.h" #include "BKE_lib_id.h" #include "BKE_lib_override.h" #include "BKE_lib_query.h" #include "BKE_lib_remap.h" +#include "BKE_light.h" #include "BKE_lightprobe.h" #include "BKE_main.h" #include "BKE_material.h" @@ -108,8 +108,8 @@ #include "ED_curve.h" #include "ED_gpencil.h" #include "ED_keyframing.h" -#include "ED_object.h" #include "ED_mesh.h" +#include "ED_object.h" #include "ED_screen.h" #include "ED_view3d.h" diff --git a/source/blender/editors/object/object_remesh.c b/source/blender/editors/object/object_remesh.c index 631cd961e66..a9f2319d926 100644 --- a/source/blender/editors/object/object_remesh.c +++ b/source/blender/editors/object/object_remesh.c @@ -21,11 +21,11 @@ * \ingroup edobj */ +#include <ctype.h> +#include <float.h> +#include <math.h> #include <stdlib.h> #include <string.h> -#include <math.h> -#include <float.h> -#include <ctype.h> #include "MEM_guardedalloc.h" @@ -33,26 +33,26 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#include "DNA_scene_types.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 "DNA_scene_types.h" #include "BKE_context.h" +#include "BKE_customdata.h" #include "BKE_global.h" #include "BKE_lib_id.h" #include "BKE_main.h" #include "BKE_mesh.h" -#include "BKE_mesh_runtime.h" #include "BKE_mesh_mirror.h" +#include "BKE_mesh_remesh_voxel.h" +#include "BKE_mesh_runtime.h" #include "BKE_modifier.h" #include "BKE_object.h" #include "BKE_paint.h" #include "BKE_report.h" #include "BKE_scene.h" #include "BKE_shrinkwrap.h" -#include "BKE_customdata.h" -#include "BKE_mesh_remesh_voxel.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" @@ -68,9 +68,9 @@ #include "RNA_enum_types.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" #include "WM_toolsystem.h" +#include "WM_types.h" #include "object_intern.h" // own include diff --git a/source/blender/editors/object/object_select.c b/source/blender/editors/object/object_select.c index 29b2ba59ee9..8f01adb202e 100644 --- a/source/blender/editors/object/object_select.c +++ b/source/blender/editors/object/object_select.c @@ -27,18 +27,18 @@ #include <string.h> #include "DNA_anim_types.h" +#include "DNA_armature_types.h" #include "DNA_collection_types.h" +#include "DNA_gpencil_types.h" +#include "DNA_light_types.h" #include "DNA_material_types.h" #include "DNA_modifier_types.h" #include "DNA_scene_types.h" -#include "DNA_armature_types.h" -#include "DNA_light_types.h" #include "DNA_workspace_types.h" -#include "DNA_gpencil_types.h" +#include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_math_bits.h" -#include "BLI_listbase.h" #include "BLI_rand.h" #include "BLI_string_utils.h" #include "BLI_utildefines.h" @@ -64,15 +64,15 @@ #include "DEG_depsgraph.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" +#include "WM_types.h" #include "ED_armature.h" +#include "ED_keyframing.h" #include "ED_object.h" #include "ED_outliner.h" #include "ED_screen.h" #include "ED_select_utils.h" -#include "ED_keyframing.h" #include "UI_interface.h" #include "UI_resources.h" diff --git a/source/blender/editors/object/object_shader_fx.c b/source/blender/editors/object/object_shader_fx.c index db0c8c54186..cd71ab674ba 100644 --- a/source/blender/editors/object/object_shader_fx.c +++ b/source/blender/editors/object/object_shader_fx.c @@ -28,9 +28,9 @@ #include "MEM_guardedalloc.h" #include "DNA_gpencil_types.h" -#include "DNA_shader_fx_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" +#include "DNA_shader_fx_types.h" #include "BLI_listbase.h" #include "BLI_string_utf8.h" @@ -40,9 +40,9 @@ #include "BKE_context.h" #include "BKE_main.h" -#include "BKE_shader_fx.h" -#include "BKE_report.h" #include "BKE_object.h" +#include "BKE_report.h" +#include "BKE_shader_fx.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" diff --git a/source/blender/editors/object/object_shapekey.c b/source/blender/editors/object/object_shapekey.c index fb76ba6099d..abce985b65a 100644 --- a/source/blender/editors/object/object_shapekey.c +++ b/source/blender/editors/object/object_shapekey.c @@ -55,8 +55,8 @@ #include "BLI_sys_types.h" // for intptr_t support -#include "ED_object.h" #include "ED_mesh.h" +#include "ED_object.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c index 4a085bb61bf..a467667a4c7 100644 --- a/source/blender/editors/object/object_transform.c +++ b/source/blender/editors/object/object_transform.c @@ -26,54 +26,54 @@ #include "DNA_anim_types.h" #include "DNA_armature_types.h" +#include "DNA_collection_types.h" +#include "DNA_gpencil_types.h" +#include "DNA_lattice_types.h" +#include "DNA_light_types.h" #include "DNA_mesh_types.h" #include "DNA_meta_types.h" -#include "DNA_light_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_gpencil_types.h" -#include "DNA_collection_types.h" -#include "DNA_lattice_types.h" -#include "BLI_math.h" +#include "BLI_array.h" #include "BLI_listbase.h" +#include "BLI_math.h" #include "BLI_utildefines.h" -#include "BLI_array.h" +#include "BKE_armature.h" #include "BKE_context.h" #include "BKE_curve.h" -#include "BKE_main.h" +#include "BKE_editmesh.h" +#include "BKE_gpencil.h" #include "BKE_idcode.h" +#include "BKE_lattice.h" #include "BKE_layer.h" +#include "BKE_lib_id.h" +#include "BKE_main.h" #include "BKE_mball.h" #include "BKE_mesh.h" +#include "BKE_multires.h" #include "BKE_object.h" -#include "BKE_scene.h" #include "BKE_report.h" -#include "BKE_editmesh.h" -#include "BKE_multires.h" -#include "BKE_armature.h" -#include "BKE_lattice.h" -#include "BKE_lib_id.h" +#include "BKE_scene.h" #include "BKE_tracking.h" -#include "BKE_gpencil.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" #include "WM_api.h" #include "WM_types.h" #include "ED_armature.h" +#include "ED_gpencil.h" #include "ED_keyframing.h" #include "ED_mesh.h" +#include "ED_object.h" #include "ED_screen.h" #include "ED_view3d.h" -#include "ED_gpencil.h" -#include "ED_object.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/object/object_utils.c b/source/blender/editors/object/object_utils.c index ed764f4dcfc..d6056f85932 100644 --- a/source/blender/editors/object/object_utils.c +++ b/source/blender/editors/object/object_utils.c @@ -23,10 +23,10 @@ #include "DNA_anim_types.h" #include "DNA_armature_types.h" +#include "DNA_collection_types.h" #include "DNA_meta_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_collection_types.h" #include "BLI_math.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index c11b3aebe72..3ec55d42849 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -21,17 +21,17 @@ * \ingroup edobj */ -#include <string.h> -#include <stddef.h> -#include <math.h> #include <assert.h> +#include <math.h> +#include <stddef.h> +#include <string.h> #include "MEM_guardedalloc.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_scene_types.h" @@ -39,24 +39,24 @@ #include "BLI_alloca.h" #include "BLI_array.h" -#include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_math.h" #include "BLI_utildefines.h" #include "BLI_utildefines_stack.h" #include "BKE_context.h" #include "BKE_customdata.h" #include "BKE_deform.h" +#include "BKE_editmesh.h" +#include "BKE_lattice.h" +#include "BKE_layer.h" #include "BKE_mesh.h" #include "BKE_mesh_mapping.h" #include "BKE_mesh_runtime.h" -#include "BKE_editmesh.h" -#include "BKE_layer.h" #include "BKE_modifier.h" -#include "BKE_report.h" -#include "BKE_object_deform.h" #include "BKE_object.h" -#include "BKE_lattice.h" +#include "BKE_object_deform.h" +#include "BKE_report.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" @@ -70,8 +70,8 @@ #include "WM_api.h" #include "WM_types.h" -#include "ED_object.h" #include "ED_mesh.h" +#include "ED_object.h" #include "UI_resources.h" diff --git a/source/blender/editors/object/object_volume.c b/source/blender/editors/object/object_volume.c index 64482a0bcf6..92fb0788f6b 100644 --- a/source/blender/editors/object/object_volume.c +++ b/source/blender/editors/object/object_volume.c @@ -43,8 +43,8 @@ #include "BKE_report.h" #include "BKE_volume.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" #include "ED_image.h" #include "ED_object.h" diff --git a/source/blender/editors/object/object_warp.c b/source/blender/editors/object/object_warp.c index 836e38e3676..00f9330c8a7 100644 --- a/source/blender/editors/object/object_warp.c +++ b/source/blender/editors/object/object_warp.c @@ -35,8 +35,8 @@ #include "WM_api.h" #include "WM_types.h" -#include "ED_view3d.h" #include "ED_transverts.h" +#include "ED_view3d.h" #include "object_intern.h" diff --git a/source/blender/editors/physics/dynamicpaint_ops.c b/source/blender/editors/physics/dynamicpaint_ops.c index b0dbe5d9a3e..37845e8d74e 100644 --- a/source/blender/editors/physics/dynamicpaint_ops.c +++ b/source/blender/editors/physics/dynamicpaint_ops.c @@ -37,11 +37,11 @@ #include "BKE_context.h" #include "BKE_deform.h" -#include "BKE_object_deform.h" #include "BKE_dynamicpaint.h" #include "BKE_global.h" #include "BKE_main.h" #include "BKE_modifier.h" +#include "BKE_object_deform.h" #include "BKE_report.h" #include "BKE_screen.h" @@ -50,8 +50,8 @@ #include "DEG_depsgraph_query.h" #include "ED_mesh.h" -#include "ED_screen.h" #include "ED_object.h" +#include "ED_screen.h" #include "RNA_access.h" #include "RNA_define.h" @@ -59,8 +59,8 @@ #include "PIL_time.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" #include "physics_intern.h" /* own include */ diff --git a/source/blender/editors/physics/particle_boids.c b/source/blender/editors/physics/particle_boids.c index 55fc49165c9..22cfa50aee9 100644 --- a/source/blender/editors/physics/particle_boids.c +++ b/source/blender/editors/physics/particle_boids.c @@ -39,8 +39,8 @@ #include "DEG_depsgraph_build.h" #include "RNA_access.h" -#include "RNA_enum_types.h" #include "RNA_define.h" +#include "RNA_enum_types.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c index 17875688c61..8a40f65fc8a 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -21,26 +21,26 @@ * \ingroup edphys */ -#include <stdlib.h> +#include <assert.h> #include <math.h> +#include <stdlib.h> #include <string.h> -#include <assert.h> #include "MEM_guardedalloc.h" -#include "DNA_scene_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "DNA_view3d_types.h" +#include "DNA_scene_types.h" #include "DNA_screen_types.h" #include "DNA_space_types.h" +#include "DNA_view3d_types.h" -#include "BLI_math.h" +#include "BLI_kdtree.h" #include "BLI_lasso_2d.h" #include "BLI_listbase.h" -#include "BLI_rect.h" -#include "BLI_kdtree.h" +#include "BLI_math.h" #include "BLI_rand.h" +#include "BLI_rect.h" #include "BLI_task.h" #include "BLI_utildefines.h" @@ -59,10 +59,10 @@ #include "DEG_depsgraph.h" -#include "ED_object.h" -#include "ED_physics.h" #include "ED_mesh.h" +#include "ED_object.h" #include "ED_particle.h" +#include "ED_physics.h" #include "ED_screen.h" #include "ED_select_utils.h" #include "ED_view3d.h" @@ -74,9 +74,9 @@ #include "UI_resources.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" #include "WM_toolsystem.h" +#include "WM_types.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/physics/particle_edit_undo.c b/source/blender/editors/physics/particle_edit_undo.c index e85b025e28e..5b363bdca78 100644 --- a/source/blender/editors/physics/particle_edit_undo.c +++ b/source/blender/editors/physics/particle_edit_undo.c @@ -21,15 +21,15 @@ * \ingroup edphys */ -#include <stdlib.h> +#include <assert.h> #include <math.h> +#include <stdlib.h> #include <string.h> -#include <assert.h> #include "MEM_guardedalloc.h" -#include "DNA_scene_types.h" #include "DNA_meshdata_types.h" +#include "DNA_scene_types.h" #include "DNA_windowmanager_types.h" #include "BLI_listbase.h" diff --git a/source/blender/editors/physics/particle_object.c b/source/blender/editors/physics/particle_object.c index 4bd58d1bebc..f37a20bf43e 100644 --- a/source/blender/editors/physics/particle_object.c +++ b/source/blender/editors/physics/particle_object.c @@ -31,10 +31,10 @@ #include "DNA_modifier_types.h" #include "DNA_scene_types.h" -#include "BLI_math.h" #include "BLI_listbase.h" -#include "BLI_utildefines.h" +#include "BLI_math.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "BKE_bvhutils.h" #include "BKE_context.h" @@ -59,9 +59,9 @@ #include "WM_api.h" #include "WM_types.h" +#include "ED_object.h" #include "ED_particle.h" #include "ED_screen.h" -#include "ED_object.h" #include "UI_resources.h" diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c index 0b754780cde..bfbe1d22334 100644 --- a/source/blender/editors/physics/physics_fluid.c +++ b/source/blender/editors/physics/physics_fluid.c @@ -33,37 +33,37 @@ #include "DNA_object_types.h" #include "BLI_blenlib.h" -#include "BLI_path_util.h" #include "BLI_math.h" +#include "BLI_path_util.h" #include "BLI_utildefines.h" #include "BLT_translation.h" #include "BKE_context.h" #include "BKE_customdata.h" +#include "BKE_fluid.h" +#include "BKE_global.h" #include "BKE_main.h" #include "BKE_modifier.h" #include "BKE_object.h" #include "BKE_report.h" #include "BKE_scene.h" #include "BKE_screen.h" -#include "BKE_fluid.h" -#include "BKE_global.h" #include "DEG_depsgraph.h" #include "ED_screen.h" #include "PIL_time.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" -#include "physics_intern.h" // own include #include "manta_fluid_API.h" +#include "physics_intern.h" // own include -#include "DNA_scene_types.h" #include "DNA_fluid_types.h" #include "DNA_mesh_types.h" +#include "DNA_scene_types.h" #define FLUID_JOB_BAKE_ALL "FLUID_OT_bake_all" #define FLUID_JOB_BAKE_DATA "FLUID_OT_bake_data" diff --git a/source/blender/editors/physics/physics_ops.c b/source/blender/editors/physics/physics_ops.c index ea638a2fe44..f6943c25063 100644 --- a/source/blender/editors/physics/physics_ops.c +++ b/source/blender/editors/physics/physics_ops.c @@ -28,9 +28,9 @@ #include "WM_api.h" #include "WM_types.h" -#include "ED_select_utils.h" -#include "ED_physics.h" #include "ED_object.h" +#include "ED_physics.h" +#include "ED_select_utils.h" #include "physics_intern.h" // own include diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index f687120d228..8a8fd703845 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -22,15 +22,15 @@ */ #include <math.h> -#include <string.h> #include <stddef.h> +#include <string.h> #include "MEM_guardedalloc.h" #include "BLI_listbase.h" -#include "BLI_timecode.h" #include "BLI_math.h" #include "BLI_threads.h" +#include "BLI_timecode.h" #include "BLI_utildefines.h" #include "PIL_time.h" @@ -39,14 +39,14 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_view3d_types.h" #include "DNA_userdef_types.h" +#include "DNA_view3d_types.h" #include "BKE_blender_undo.h" #include "BKE_blender_version.h" #include "BKE_camera.h" -#include "BKE_context.h" #include "BKE_colortools.h" +#include "BKE_context.h" #include "BKE_global.h" #include "BKE_image.h" #include "BKE_layer.h" @@ -55,9 +55,9 @@ #include "BKE_node.h" #include "BKE_object.h" #include "BKE_report.h" -#include "BKE_sequencer.h" -#include "BKE_screen.h" #include "BKE_scene.h" +#include "BKE_screen.h" +#include "BKE_sequencer.h" #include "BKE_undo_system.h" #include "DEG_depsgraph.h" @@ -68,14 +68,14 @@ #include "ED_object.h" #include "ED_render.h" #include "ED_screen.h" -#include "ED_util.h" #include "ED_undo.h" +#include "ED_util.h" #include "ED_view3d.h" #include "BIF_glutil.h" -#include "RE_pipeline.h" #include "RE_engine.h" +#include "RE_pipeline.h" #include "IMB_colormanagement.h" #include "IMB_imbuf_types.h" diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c index 6baf8cdba07..442f700ad6f 100644 --- a/source/blender/editors/render/render_opengl.c +++ b/source/blender/editors/render/render_opengl.c @@ -22,26 +22,26 @@ */ #include <math.h> -#include <string.h> #include <stddef.h> +#include <string.h> #include "MEM_guardedalloc.h" -#include "DNA_camera_types.h" #include "BLI_bitmap.h" +#include "BLI_blenlib.h" #include "BLI_math.h" #include "BLI_math_color_blend.h" -#include "BLI_blenlib.h" -#include "BLI_utildefines.h" -#include "BLI_threads.h" #include "BLI_task.h" +#include "BLI_threads.h" +#include "BLI_utildefines.h" +#include "DNA_camera_types.h" -#include "DNA_anim_types.h" #include "DNA_action_types.h" +#include "DNA_anim_types.h" #include "DNA_curve_types.h" -#include "DNA_scene_types.h" -#include "DNA_object_types.h" #include "DNA_gpencil_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BKE_animsys.h" #include "BKE_camera.h" @@ -65,15 +65,15 @@ #include "WM_api.h" #include "WM_types.h" +#include "ED_gpencil.h" #include "ED_screen.h" #include "ED_view3d.h" #include "ED_view3d_offscreen.h" -#include "ED_gpencil.h" -#include "RE_pipeline.h" -#include "IMB_imbuf_types.h" -#include "IMB_imbuf.h" #include "IMB_colormanagement.h" +#include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" +#include "RE_pipeline.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c index 369572a5d6d..1427c6ed500 100644 --- a/source/blender/editors/render/render_preview.c +++ b/source/blender/editors/render/render_preview.c @@ -23,8 +23,8 @@ /* global includes */ -#include <stdlib.h> #include <math.h> +#include <stdlib.h> #include <string.h> #ifndef WIN32 @@ -34,37 +34,37 @@ #endif #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_math.h" #include "BLI_utildefines.h" #include "PIL_time.h" #include "BLO_readfile.h" -#include "DNA_world_types.h" +#include "DNA_brush_types.h" #include "DNA_camera_types.h" #include "DNA_collection_types.h" +#include "DNA_light_types.h" #include "DNA_material_types.h" #include "DNA_node_types.h" #include "DNA_object_types.h" -#include "DNA_light_types.h" -#include "DNA_space_types.h" #include "DNA_scene_types.h" -#include "DNA_brush_types.h" #include "DNA_screen_types.h" +#include "DNA_space_types.h" +#include "DNA_world_types.h" #include "BKE_appdir.h" #include "BKE_brush.h" -#include "BKE_context.h" #include "BKE_colortools.h" +#include "BKE_context.h" #include "BKE_global.h" +#include "BKE_icons.h" #include "BKE_idprop.h" #include "BKE_image.h" -#include "BKE_icons.h" +#include "BKE_layer.h" #include "BKE_lib_id.h" #include "BKE_light.h" -#include "BKE_layer.h" #include "BKE_main.h" #include "BKE_material.h" #include "BKE_node.h" @@ -73,8 +73,8 @@ #include "BKE_world.h" #include "DEG_depsgraph.h" -#include "DEG_depsgraph_query.h" #include "DEG_depsgraph_build.h" +#include "DEG_depsgraph_query.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" @@ -82,11 +82,11 @@ #include "BIF_glutil.h" -#include "GPU_shader.h" #include "GPU_glew.h" +#include "GPU_shader.h" -#include "RE_pipeline.h" #include "RE_engine.h" +#include "RE_pipeline.h" #include "RE_shader_ext.h" #include "WM_api.h" diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c index d022de0545f..62a078bedb7 100644 --- a/source/blender/editors/render/render_shading.c +++ b/source/blender/editors/render/render_shading.c @@ -36,9 +36,9 @@ #include "DNA_space_types.h" #include "DNA_world_types.h" -#include "BLI_utildefines.h" #include "BLI_listbase.h" #include "BLI_math_vector.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" @@ -76,10 +76,10 @@ #include "WM_api.h" #include "WM_types.h" -#include "ED_object.h" #include "ED_curve.h" #include "ED_mesh.h" #include "ED_node.h" +#include "ED_object.h" #include "ED_render.h" #include "ED_scene.h" #include "ED_screen.h" diff --git a/source/blender/editors/render/render_update.c b/source/blender/editors/render/render_update.c index e494bd90d65..d2bb53de06f 100644 --- a/source/blender/editors/render/render_update.c +++ b/source/blender/editors/render/render_update.c @@ -32,9 +32,9 @@ #include "DNA_screen_types.h" #include "DNA_space_types.h" #include "DNA_view3d_types.h" +#include "DNA_windowmanager_types.h" #include "DNA_workspace_types.h" #include "DNA_world_types.h" -#include "DNA_windowmanager_types.h" #include "DRW_engine.h" diff --git a/source/blender/editors/render/render_view.c b/source/blender/editors/render/render_view.c index 1aa0c0ab37d..a93ea343229 100644 --- a/source/blender/editors/render/render_view.c +++ b/source/blender/editors/render/render_view.c @@ -21,8 +21,8 @@ * \ingroup edrend */ -#include <string.h> #include <stddef.h> +#include <string.h> #include "BLI_listbase.h" #include "BLI_utildefines.h" @@ -31,11 +31,11 @@ #include "DNA_userdef_types.h" #include "BKE_context.h" -#include "BKE_image.h" #include "BKE_global.h" +#include "BKE_image.h" #include "BKE_main.h" -#include "BKE_screen.h" #include "BKE_report.h" +#include "BKE_screen.h" #include "BLT_translation.h" diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index a083675ca01..56ea59c1d6e 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -21,18 +21,18 @@ * \ingroup edscr */ -#include <string.h> #include <stdio.h> +#include <string.h> #include "MEM_guardedalloc.h" #include "DNA_userdef_types.h" #include "BLI_blenlib.h" +#include "BLI_linklist_stack.h" #include "BLI_math.h" #include "BLI_rand.h" #include "BLI_utildefines.h" -#include "BLI_linklist_stack.h" #include "BKE_context.h" #include "BKE_global.h" @@ -44,20 +44,20 @@ #include "RNA_types.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" #include "WM_toolsystem.h" +#include "WM_types.h" #include "ED_screen.h" #include "ED_screen_types.h" #include "ED_space_api.h" #include "ED_time_scrub_ui.h" +#include "GPU_framebuffer.h" #include "GPU_immediate.h" #include "GPU_immediate_util.h" #include "GPU_matrix.h" #include "GPU_state.h" -#include "GPU_framebuffer.h" #include "BLF_api.h" diff --git a/source/blender/editors/screen/area_query.c b/source/blender/editors/screen/area_query.c index 2cccd9a2ba5..739f1b93e07 100644 --- a/source/blender/editors/screen/area_query.c +++ b/source/blender/editors/screen/area_query.c @@ -23,8 +23,8 @@ #include "DNA_userdef_types.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_math_base.h" +#include "BLI_utildefines.h" #include "RNA_types.h" diff --git a/source/blender/editors/screen/glutil.c b/source/blender/editors/screen/glutil.c index 94c1f4cfc35..f757b856dcf 100644 --- a/source/blender/editors/screen/glutil.c +++ b/source/blender/editors/screen/glutil.c @@ -27,8 +27,8 @@ #include "DNA_userdef_types.h" #include "DNA_vec_types.h" -#include "BLI_utildefines.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "BKE_context.h" diff --git a/source/blender/editors/screen/screen_context.c b/source/blender/editors/screen/screen_context.c index 540a4c05247..9536772be3d 100644 --- a/source/blender/editors/screen/screen_context.c +++ b/source/blender/editors/screen/screen_context.c @@ -27,33 +27,33 @@ #include "MEM_guardedalloc.h" -#include "DNA_object_types.h" #include "DNA_armature_types.h" #include "DNA_gpencil_types.h" -#include "DNA_sequence_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" +#include "DNA_sequence_types.h" #include "DNA_space_types.h" #include "DNA_windowmanager_types.h" #include "BLI_utildefines.h" -#include "BKE_context.h" -#include "BKE_object.h" #include "BKE_action.h" #include "BKE_armature.h" +#include "BKE_context.h" #include "BKE_gpencil.h" #include "BKE_layer.h" +#include "BKE_object.h" #include "BKE_sequencer.h" #include "RNA_access.h" +#include "ED_anim_api.h" #include "ED_armature.h" #include "ED_gpencil.h" -#include "ED_anim_api.h" -#include "WM_api.h" #include "UI_interface.h" +#include "WM_api.h" #include "screen_intern.h" diff --git a/source/blender/editors/screen/screen_draw.c b/source/blender/editors/screen/screen_draw.c index a6b8bba73e3..3331f4db11b 100644 --- a/source/blender/editors/screen/screen_draw.c +++ b/source/blender/editors/screen/screen_draw.c @@ -21,10 +21,10 @@ #include "ED_screen.h" #include "GPU_batch_presets.h" -#include "GPU_platform.h" #include "GPU_framebuffer.h" #include "GPU_immediate.h" #include "GPU_matrix.h" +#include "GPU_platform.h" #include "GPU_state.h" #include "BLI_listbase.h" diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index d62ea73876f..f25f685f2e1 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -21,15 +21,15 @@ * \ingroup edscr */ -#include <string.h> #include <math.h> +#include <string.h> #include "MEM_guardedalloc.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_workspace_types.h" #include "DNA_userdef_types.h" +#include "DNA_workspace_types.h" #include "BLI_blenlib.h" #include "BLI_utildefines.h" @@ -41,18 +41,18 @@ #include "BKE_layer.h" #include "BKE_lib_id.h" #include "BKE_main.h" -#include "BKE_screen.h" #include "BKE_scene.h" +#include "BKE_screen.h" #include "BKE_sound.h" #include "BKE_workspace.h" #include "WM_api.h" #include "WM_types.h" -#include "ED_screen.h" -#include "ED_screen_types.h" #include "ED_clip.h" #include "ED_node.h" +#include "ED_screen.h" +#include "ED_screen_types.h" #include "UI_interface.h" diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 2fe34d61a04..fccdf3f06f3 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -26,25 +26,25 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_blenlib.h" #include "BLI_dlrbTree.h" +#include "BLI_math.h" #include "BLI_utildefines.h" #include "BLT_translation.h" #include "DNA_anim_types.h" #include "DNA_armature_types.h" -#include "DNA_lattice_types.h" -#include "DNA_object_types.h" #include "DNA_curve_types.h" -#include "DNA_scene_types.h" -#include "DNA_meta_types.h" -#include "DNA_mesh_types.h" +#include "DNA_lattice_types.h" #include "DNA_mask_types.h" +#include "DNA_mesh_types.h" +#include "DNA_meta_types.h" #include "DNA_node_types.h" -#include "DNA_workspace_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "DNA_userdef_types.h" +#include "DNA_workspace_types.h" #include "BKE_context.h" #include "BKE_editmesh.h" @@ -77,8 +77,8 @@ #include "ED_screen.h" #include "ED_screen_types.h" #include "ED_sequencer.h" -#include "ED_util.h" #include "ED_undo.h" +#include "ED_util.h" #include "ED_view3d.h" #include "RNA_access.h" diff --git a/source/blender/editors/screen/screen_user_menu.c b/source/blender/editors/screen/screen_user_menu.c index 661c17f55d2..38d83801f2b 100644 --- a/source/blender/editors/screen/screen_user_menu.c +++ b/source/blender/editors/screen/screen_user_menu.c @@ -21,25 +21,25 @@ * \ingroup spview3d */ -#include <string.h> -#include <stdio.h> -#include <math.h> #include <float.h> +#include <math.h> +#include <stdio.h> +#include <string.h> #include "DNA_scene_types.h" #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_listbase.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" #include "BKE_blender_user_menu.h" #include "BKE_context.h" -#include "BKE_screen.h" #include "BKE_idprop.h" +#include "BKE_screen.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/screen/screendump.c b/source/blender/editors/screen/screendump.c index 005c76d26b0..d52dc262c3f 100644 --- a/source/blender/editors/screen/screendump.c +++ b/source/blender/editors/screen/screendump.c @@ -22,16 +22,16 @@ * \ingroup edscr */ -#include <string.h> #include <errno.h> +#include <string.h> #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" #include "BLI_utildefines.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" @@ -48,8 +48,8 @@ #include "UI_interface.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" #include "screen_intern.h" diff --git a/source/blender/editors/screen/workspace_edit.c b/source/blender/editors/screen/workspace_edit.c index 47f6324ee0d..784fa60999d 100644 --- a/source/blender/editors/screen/workspace_edit.c +++ b/source/blender/editors/screen/workspace_edit.c @@ -21,10 +21,10 @@ #include <stdlib.h> #include <string.h> -#include "BLI_utildefines.h" #include "BLI_fileops.h" #include "BLI_listbase.h" #include "BLI_path_util.h" +#include "BLI_utildefines.h" #include "BKE_appdir.h" #include "BKE_blendfile.h" diff --git a/source/blender/editors/screen/workspace_layout_edit.c b/source/blender/editors/screen/workspace_layout_edit.c index 67ac5067134..276e36b97dc 100644 --- a/source/blender/editors/screen/workspace_layout_edit.c +++ b/source/blender/editors/screen/workspace_layout_edit.c @@ -20,8 +20,8 @@ #include <stdlib.h> -#include "BLI_utildefines.h" #include "BLI_listbase.h" +#include "BLI_utildefines.h" #include "DNA_screen_types.h" #include "DNA_workspace_types.h" diff --git a/source/blender/editors/sculpt_paint/paint_cursor.c b/source/blender/editors/sculpt_paint/paint_cursor.c index 0ddce872545..c035863203b 100644 --- a/source/blender/editors/sculpt_paint/paint_cursor.c +++ b/source/blender/editors/sculpt_paint/paint_cursor.c @@ -29,8 +29,8 @@ #include "BLI_utildefines.h" #include "DNA_brush_types.h" -#include "DNA_customdata_types.h" #include "DNA_color_types.h" +#include "DNA_customdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" @@ -39,13 +39,13 @@ #include "DNA_view3d_types.h" #include "BKE_brush.h" +#include "BKE_colortools.h" #include "BKE_context.h" #include "BKE_curve.h" #include "BKE_image.h" #include "BKE_node.h" -#include "BKE_paint.h" -#include "BKE_colortools.h" #include "BKE_object.h" +#include "BKE_paint.h" #include "WM_api.h" #include "wm_cursors.h" diff --git a/source/blender/editors/sculpt_paint/paint_curve.c b/source/blender/editors/sculpt_paint/paint_curve.c index 4578e211c97..68fd2f15877 100644 --- a/source/blender/editors/sculpt_paint/paint_curve.c +++ b/source/blender/editors/sculpt_paint/paint_curve.c @@ -18,8 +18,8 @@ * \ingroup edsculpt */ -#include <string.h> #include <limits.h> +#include <string.h> #include "MEM_guardedalloc.h" @@ -35,8 +35,8 @@ #include "BKE_main.h" #include "BKE_paint.h" -#include "ED_view3d.h" #include "ED_paint.h" +#include "ED_view3d.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/sculpt_paint/paint_hide.c b/source/blender/editors/sculpt_paint/paint_hide.c index 32b0965363a..ce5a80585b0 100644 --- a/source/blender/editors/sculpt_paint/paint_hide.c +++ b/source/blender/editors/sculpt_paint/paint_hide.c @@ -33,12 +33,12 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BKE_pbvh.h" #include "BKE_ccg.h" #include "BKE_context.h" #include "BKE_mesh.h" #include "BKE_multires.h" #include "BKE_paint.h" +#include "BKE_pbvh.h" #include "BKE_subsurf.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c index dd064591018..cbb0ce84156 100644 --- a/source/blender/editors/sculpt_paint/paint_image.c +++ b/source/blender/editors/sculpt_paint/paint_image.c @@ -24,14 +24,14 @@ */ #include <float.h> -#include <string.h> -#include <stdio.h> #include <math.h> +#include <stdio.h> +#include <string.h> #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_math.h" #include "BLI_utildefines.h" #include "BLT_translation.h" @@ -44,9 +44,9 @@ #include "DNA_node_types.h" #include "DNA_object_types.h" +#include "BKE_brush.h" #include "BKE_colorband.h" #include "BKE_context.h" -#include "BKE_brush.h" #include "BKE_image.h" #include "BKE_main.h" #include "BKE_material.h" @@ -67,9 +67,9 @@ #include "ED_view3d.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" #include "WM_toolsystem.h" +#include "WM_types.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/sculpt_paint/paint_image_2d.c b/source/blender/editors/sculpt_paint/paint_image_2d.c index 4a99e40a361..fc56c5cb6c6 100644 --- a/source/blender/editors/sculpt_paint/paint_image_2d.c +++ b/source/blender/editors/sculpt_paint/paint_image_2d.c @@ -26,19 +26,19 @@ #include "MEM_guardedalloc.h" #include "DNA_brush_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_space_types.h" -#include "DNA_object_types.h" +#include "BLI_bitmap.h" #include "BLI_listbase.h" #include "BLI_math_color_blend.h" #include "BLI_stack.h" -#include "BLI_bitmap.h" #include "BLI_task.h" +#include "BKE_brush.h" #include "BKE_colorband.h" #include "BKE_context.h" -#include "BKE_brush.h" #include "BKE_image.h" #include "BKE_paint.h" #include "BKE_report.h" @@ -48,9 +48,9 @@ #include "ED_paint.h" #include "ED_screen.h" +#include "IMB_colormanagement.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" -#include "IMB_colormanagement.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index b45e4f81027..8362a4a576a 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -24,9 +24,9 @@ */ #include <float.h> -#include <string.h> -#include <stdio.h> #include <math.h> +#include <stdio.h> +#include <string.h> #include "MEM_guardedalloc.h" @@ -61,8 +61,8 @@ #include "BKE_brush.h" #include "BKE_camera.h" #include "BKE_colorband.h" -#include "BKE_context.h" #include "BKE_colortools.h" +#include "BKE_context.h" #include "BKE_customdata.h" #include "BKE_idprop.h" #include "BKE_image.h" @@ -81,8 +81,8 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" -#include "ED_object.h" #include "ED_node.h" +#include "ED_object.h" #include "ED_paint.h" #include "ED_screen.h" #include "ED_uvedit.h" diff --git a/source/blender/editors/sculpt_paint/paint_mask.c b/source/blender/editors/sculpt_paint/paint_mask.c index d6e5559b810..fb8cc3a639b 100644 --- a/source/blender/editors/sculpt_paint/paint_mask.c +++ b/source/blender/editors/sculpt_paint/paint_mask.c @@ -27,17 +27,17 @@ #include "DNA_object_types.h" #include "BLI_bitmap_draw_2d.h" -#include "BLI_math_matrix.h" -#include "BLI_math_geom.h" -#include "BLI_utildefines.h" #include "BLI_lasso_2d.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" #include "BLI_task.h" +#include "BLI_utildefines.h" -#include "BKE_pbvh.h" #include "BKE_ccg.h" #include "BKE_context.h" #include "BKE_multires.h" #include "BKE_paint.h" +#include "BKE_pbvh.h" #include "BKE_subsurf.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/sculpt_paint/paint_ops.c b/source/blender/editors/sculpt_paint/paint_ops.c index 6f0ee3626e4..59a0c50d402 100644 --- a/source/blender/editors/sculpt_paint/paint_ops.c +++ b/source/blender/editors/sculpt_paint/paint_ops.c @@ -20,19 +20,19 @@ #include "MEM_guardedalloc.h" -#include <stdlib.h> #include "BLI_listbase.h" -#include "BLI_utildefines.h" #include "BLI_math_vector.h" #include "BLI_string.h" +#include "BLI_utildefines.h" +#include <stdlib.h> -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" +#include "DNA_brush_types.h" #include "DNA_customdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_brush_types.h" #include "BKE_brush.h" #include "BKE_context.h" @@ -42,13 +42,13 @@ #include "BKE_paint.h" #include "BKE_report.h" +#include "ED_image.h" #include "ED_paint.h" #include "ED_screen.h" -#include "ED_image.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_toolsystem.h" +#include "WM_types.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/sculpt_paint/paint_stroke.c b/source/blender/editors/sculpt_paint/paint_stroke.c index 0e194e57538..01a0e8ddd5b 100644 --- a/source/blender/editors/sculpt_paint/paint_stroke.c +++ b/source/blender/editors/sculpt_paint/paint_stroke.c @@ -23,26 +23,26 @@ #include "MEM_guardedalloc.h" +#include "BLI_listbase.h" #include "BLI_math.h" -#include "BLI_utildefines.h" #include "BLI_rand.h" -#include "BLI_listbase.h" +#include "BLI_utildefines.h" #include "PIL_time.h" -#include "DNA_object_types.h" -#include "DNA_scene_types.h" #include "DNA_brush_types.h" #include "DNA_curve_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "RNA_access.h" -#include "BKE_context.h" -#include "BKE_paint.h" #include "BKE_brush.h" -#include "BKE_curve.h" #include "BKE_colortools.h" +#include "BKE_context.h" +#include "BKE_curve.h" #include "BKE_image.h" +#include "BKE_paint.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/sculpt_paint/paint_utils.c b/source/blender/editors/sculpt_paint/paint_utils.c index 77a3aa529e6..e67d43d4571 100644 --- a/source/blender/editors/sculpt_paint/paint_utils.c +++ b/source/blender/editors/sculpt_paint/paint_utils.c @@ -24,19 +24,19 @@ #include <math.h> #include <stdlib.h> +#include "DNA_material_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" -#include "DNA_material_types.h" -#include "DNA_scene_types.h" #include "DNA_brush_types.h" +#include "DNA_scene_types.h" +#include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_math_color.h" -#include "BLI_utildefines.h" -#include "BLI_listbase.h" #include "BLI_rect.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" @@ -60,13 +60,13 @@ #include "GPU_state.h" #include "IMB_colormanagement.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "RE_render_ext.h" -#include "ED_view3d.h" #include "ED_screen.h" +#include "ED_view3d.h" #include "BLI_sys_types.h" #include "ED_mesh.h" /* for face mask functions */ diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c index a00296a911f..604146e2ca6 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.c +++ b/source/blender/editors/sculpt_paint/paint_vertex.c @@ -28,23 +28,24 @@ #include "MEM_guardedalloc.h" +#include "BLI_array_utils.h" #include "BLI_listbase.h" -#include "BLI_rect.h" #include "BLI_math.h" -#include "BLI_array_utils.h" +#include "BLI_rect.h" #include "BLI_task.h" +#include "DNA_brush_types.h" #include "DNA_mesh_types.h" +#include "DNA_object_types.h" #include "DNA_particle_types.h" #include "DNA_scene_types.h" -#include "DNA_brush_types.h" -#include "DNA_object_types.h" #include "RNA_access.h" #include "BKE_brush.h" #include "BKE_context.h" #include "BKE_deform.h" +#include "BKE_layer.h" #include "BKE_main.h" #include "BKE_mesh.h" #include "BKE_mesh_mapping.h" @@ -54,29 +55,28 @@ #include "BKE_paint.h" #include "BKE_report.h" #include "BKE_subsurf.h" -#include "BKE_layer.h" #include "DEG_depsgraph.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" #include "WM_toolsystem.h" +#include "WM_types.h" #include "ED_armature.h" -#include "ED_object.h" #include "ED_mesh.h" +#include "ED_object.h" #include "ED_screen.h" #include "ED_view3d.h" /* For IMB_BlendMode only. */ #include "IMB_imbuf.h" -#include "bmesh.h" #include "BKE_ccg.h" +#include "bmesh.h" -#include "sculpt_intern.h" #include "paint_intern.h" /* own include */ +#include "sculpt_intern.h" /* -------------------------------------------------------------------- */ /** \name Internal Utilities diff --git a/source/blender/editors/sculpt_paint/paint_vertex_color_ops.c b/source/blender/editors/sculpt_paint/paint_vertex_color_ops.c index 3a4c8f20028..6e706c907dd 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex_color_ops.c +++ b/source/blender/editors/sculpt_paint/paint_vertex_color_ops.c @@ -29,8 +29,8 @@ #include "BLI_math_color.h" #include "BKE_context.h" -#include "BKE_mesh.h" #include "BKE_deform.h" +#include "BKE_mesh.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/sculpt_paint/paint_vertex_proj.c b/source/blender/editors/sculpt_paint/paint_vertex_proj.c index e9935ff3eeb..85cd211367a 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex_proj.c +++ b/source/blender/editors/sculpt_paint/paint_vertex_proj.c @@ -26,8 +26,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_listbase.h" +#include "BLI_math.h" #include "DNA_mesh_types.h" #include "DNA_object_types.h" diff --git a/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c b/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c index 5c408933559..103f312975a 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c +++ b/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c @@ -20,13 +20,13 @@ #include "MEM_guardedalloc.h" +#include "BLI_bitmap.h" #include "BLI_blenlib.h" #include "BLI_math.h" -#include "BLI_bitmap.h" +#include "DNA_brush_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "DNA_brush_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" @@ -35,6 +35,7 @@ #include "RNA_enum_types.h" #include "BKE_brush.h" +#include "BKE_colortools.h" #include "BKE_context.h" #include "BKE_deform.h" #include "BKE_mesh.h" @@ -44,7 +45,6 @@ #include "BKE_object_deform.h" #include "BKE_paint.h" #include "BKE_report.h" -#include "BKE_colortools.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/editors/sculpt_paint/paint_vertex_weight_utils.c b/source/blender/editors/sculpt_paint/paint_vertex_weight_utils.c index 517bb6324be..5a3067ef193 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex_weight_utils.c +++ b/source/blender/editors/sculpt_paint/paint_vertex_weight_utils.c @@ -33,9 +33,9 @@ #include "BKE_deform.h" #include "BKE_mesh.h" #include "BKE_modifier.h" +#include "BKE_object.h" #include "BKE_object_deform.h" #include "BKE_report.h" -#include "BKE_object.h" #include "DEG_depsgraph_build.h" diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index 1f05b3b944e..bec44242931 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -24,12 +24,12 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_blenlib.h" #include "BLI_dial_2d.h" -#include "BLI_gsqueue.h" #include "BLI_ghash.h" +#include "BLI_gsqueue.h" #include "BLI_hash.h" +#include "BLI_math.h" #include "BLI_task.h" #include "BLI_utildefines.h" @@ -37,13 +37,13 @@ #include "PIL_time.h" +#include "DNA_brush_types.h" #include "DNA_customdata_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_node_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_brush_types.h" #include "BKE_brush.h" #include "BKE_ccg.h" @@ -74,13 +74,13 @@ #include "DEG_depsgraph.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" #include "WM_toolsystem.h" +#include "WM_types.h" -#include "ED_sculpt.h" #include "ED_object.h" #include "ED_screen.h" +#include "ED_sculpt.h" #include "ED_view3d.h" #include "paint_intern.h" #include "sculpt_intern.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_cloth.c b/source/blender/editors/sculpt_paint/sculpt_cloth.c index 431f95d5509..a1ccae7b5ab 100644 --- a/source/blender/editors/sculpt_paint/sculpt_cloth.c +++ b/source/blender/editors/sculpt_paint/sculpt_cloth.c @@ -23,24 +23,24 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_blenlib.h" #include "BLI_dial_2d.h" -#include "BLI_gsqueue.h" #include "BLI_ghash.h" +#include "BLI_gsqueue.h" #include "BLI_hash.h" +#include "BLI_math.h" #include "BLI_task.h" #include "BLI_utildefines.h" #include "BLT_translation.h" +#include "DNA_brush_types.h" #include "DNA_customdata_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_node_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_brush_types.h" #include "BKE_brush.h" #include "BKE_ccg.h" @@ -71,13 +71,13 @@ #include "DEG_depsgraph.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" #include "WM_toolsystem.h" +#include "WM_types.h" -#include "ED_sculpt.h" #include "ED_object.h" #include "ED_screen.h" +#include "ED_sculpt.h" #include "ED_view3d.h" #include "paint_intern.h" #include "sculpt_intern.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_intern.h b/source/blender/editors/sculpt_paint/sculpt_intern.h index 4e36ae7aa5e..b8235dc5c95 100644 --- a/source/blender/editors/sculpt_paint/sculpt_intern.h +++ b/source/blender/editors/sculpt_paint/sculpt_intern.h @@ -24,13 +24,13 @@ #ifndef __SCULPT_INTERN_H__ #define __SCULPT_INTERN_H__ +#include "DNA_key_types.h" #include "DNA_listBase.h" #include "DNA_vec_types.h" -#include "DNA_key_types.h" #include "BLI_bitmap.h" -#include "BLI_threads.h" #include "BLI_gsqueue.h" +#include "BLI_threads.h" #include "BKE_paint.h" #include "BKE_pbvh.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_multiplane_scrape.c b/source/blender/editors/sculpt_paint/sculpt_multiplane_scrape.c index f2671b66f7f..c74a2ba503a 100644 --- a/source/blender/editors/sculpt_paint/sculpt_multiplane_scrape.c +++ b/source/blender/editors/sculpt_paint/sculpt_multiplane_scrape.c @@ -23,14 +23,14 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_math.h" #include "BLI_task.h" +#include "DNA_brush_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" -#include "DNA_brush_types.h" #include "BKE_brush.h" #include "BKE_ccg.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_pose.c b/source/blender/editors/sculpt_paint/sculpt_pose.c index 57fef1dd4a6..f1c884f9897 100644 --- a/source/blender/editors/sculpt_paint/sculpt_pose.c +++ b/source/blender/editors/sculpt_paint/sculpt_pose.c @@ -23,14 +23,14 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_math.h" #include "BLI_task.h" +#include "DNA_brush_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" -#include "DNA_brush_types.h" #include "BKE_brush.h" #include "BKE_ccg.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_undo.c b/source/blender/editors/sculpt_paint/sculpt_undo.c index 8c80818d12d..af404c64fb0 100644 --- a/source/blender/editors/sculpt_paint/sculpt_undo.c +++ b/source/blender/editors/sculpt_paint/sculpt_undo.c @@ -26,33 +26,33 @@ #include "MEM_guardedalloc.h" +#include "BLI_ghash.h" +#include "BLI_listbase.h" #include "BLI_math.h" -#include "BLI_utildefines.h" #include "BLI_string.h" -#include "BLI_listbase.h" -#include "BLI_ghash.h" #include "BLI_task.h" #include "BLI_threads.h" +#include "BLI_utildefines.h" +#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_mesh_types.h" #include "DNA_screen_types.h" #include "BKE_ccg.h" #include "BKE_context.h" #include "BKE_customdata.h" -#include "BKE_multires.h" -#include "BKE_paint.h" +#include "BKE_global.h" #include "BKE_key.h" +#include "BKE_main.h" #include "BKE_mesh.h" +#include "BKE_multires.h" +#include "BKE_paint.h" #include "BKE_scene.h" -#include "BKE_subsurf.h" #include "BKE_subdiv_ccg.h" +#include "BKE_subsurf.h" #include "BKE_undo_system.h" -#include "BKE_global.h" -#include "BKE_main.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_uv.c b/source/blender/editors/sculpt_paint/sculpt_uv.c index b652c509db9..f364c174f0f 100644 --- a/source/blender/editors/sculpt_paint/sculpt_uv.c +++ b/source/blender/editors/sculpt_paint/sculpt_uv.c @@ -24,14 +24,14 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" -#include "BLI_math.h" #include "BLI_ghash.h" +#include "BLI_math.h" +#include "BLI_utildefines.h" -#include "DNA_object_types.h" -#include "DNA_scene_types.h" #include "DNA_brush_types.h" #include "DNA_meshdata_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BKE_brush.h" #include "BKE_colortools.h" @@ -43,9 +43,9 @@ #include "DEG_depsgraph.h" -#include "ED_screen.h" #include "ED_image.h" #include "ED_mesh.h" +#include "ED_screen.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/sound/sound_ops.c b/source/blender/editors/sound/sound_ops.c index 68e9e6d4ced..61abbd10e98 100644 --- a/source/blender/editors/sound/sound_ops.c +++ b/source/blender/editors/sound/sound_ops.c @@ -21,10 +21,10 @@ * \ingroup edsnd */ -#include <string.h> -#include <stdlib.h> -#include <stdio.h> #include <stddef.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> #include "MEM_guardedalloc.h" @@ -33,9 +33,9 @@ #include "DNA_packedFile_types.h" #include "DNA_scene_types.h" -#include "DNA_space_types.h" #include "DNA_sequence_types.h" #include "DNA_sound_types.h" +#include "DNA_space_types.h" #include "DNA_userdef_types.h" #include "BKE_context.h" diff --git a/source/blender/editors/space_action/action_buttons.c b/source/blender/editors/space_action/action_buttons.c index c9c20adcab4..ed49a1ed6d6 100644 --- a/source/blender/editors/space_action/action_buttons.c +++ b/source/blender/editors/space_action/action_buttons.c @@ -21,10 +21,10 @@ * \ingroup spaction */ -#include <string.h> -#include <stdio.h> -#include <math.h> #include <float.h> +#include <math.h> +#include <stdio.h> +#include <string.h> #include "DNA_anim_types.h" #include "DNA_object_types.h" diff --git a/source/blender/editors/space_action/action_data.c b/source/blender/editors/space_action/action_data.c index 228cc77744f..6c2cee4042b 100644 --- a/source/blender/editors/space_action/action_data.c +++ b/source/blender/editors/space_action/action_data.c @@ -21,10 +21,10 @@ * \ingroup spaction */ +#include <float.h> #include <math.h> #include <stdlib.h> #include <string.h> -#include <float.h> #include "BLI_utildefines.h" @@ -33,33 +33,33 @@ #include "DNA_anim_types.h" #include "DNA_gpencil_types.h" #include "DNA_key_types.h" +#include "DNA_mask_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_mask_types.h" #include "RNA_access.h" #include "RNA_define.h" #include "RNA_enum_types.h" -#include "BKE_animsys.h" #include "BKE_action.h" +#include "BKE_animsys.h" #include "BKE_context.h" #include "BKE_fcurve.h" #include "BKE_key.h" #include "BKE_lib_id.h" #include "BKE_nla.h" -#include "BKE_scene.h" #include "BKE_report.h" +#include "BKE_scene.h" #include "UI_view2d.h" #include "ED_anim_api.h" #include "ED_gpencil.h" -#include "ED_keyframing.h" #include "ED_keyframes_edit.h" -#include "ED_screen.h" +#include "ED_keyframing.h" #include "ED_markers.h" #include "ED_mask.h" +#include "ED_screen.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/space_action/action_draw.c b/source/blender/editors/space_action/action_draw.c index 54308553343..75eeb125609 100644 --- a/source/blender/editors/space_action/action_draw.c +++ b/source/blender/editors/space_action/action_draw.c @@ -23,10 +23,10 @@ /* System includes ----------------------------------------------------- */ +#include <float.h> #include <math.h> #include <stdlib.h> #include <string.h> -#include <float.h> #include "BLI_blenlib.h" #include "BLI_math.h" @@ -38,8 +38,8 @@ #include "DNA_cachefile_types.h" #include "DNA_gpencil_types.h" #include "DNA_object_types.h" -#include "DNA_screen_types.h" #include "DNA_scene_types.h" +#include "DNA_screen_types.h" #include "BKE_action.h" #include "BKE_context.h" diff --git a/source/blender/editors/space_action/action_edit.c b/source/blender/editors/space_action/action_edit.c index d7ad2066561..927e51a3e04 100644 --- a/source/blender/editors/space_action/action_edit.c +++ b/source/blender/editors/space_action/action_edit.c @@ -21,10 +21,10 @@ * \ingroup spaction */ +#include <float.h> #include <math.h> #include <stdlib.h> #include <string.h> -#include <float.h> #include "BLI_blenlib.h" #include "BLI_math.h" @@ -35,9 +35,9 @@ #include "DNA_anim_types.h" #include "DNA_gpencil_types.h" #include "DNA_key_types.h" +#include "DNA_mask_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_mask_types.h" #include "RNA_access.h" #include "RNA_define.h" @@ -47,8 +47,8 @@ #include "BKE_animsys.h" #include "BKE_context.h" #include "BKE_fcurve.h" -#include "BKE_gpencil.h" #include "BKE_global.h" +#include "BKE_gpencil.h" #include "BKE_key.h" #include "BKE_nla.h" #include "BKE_report.h" @@ -57,11 +57,11 @@ #include "ED_anim_api.h" #include "ED_gpencil.h" -#include "ED_keyframing.h" #include "ED_keyframes_edit.h" -#include "ED_screen.h" +#include "ED_keyframing.h" #include "ED_markers.h" #include "ED_mask.h" +#include "ED_screen.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/space_action/action_ops.c b/source/blender/editors/space_action/action_ops.c index 744c6c75463..7422c05511c 100644 --- a/source/blender/editors/space_action/action_ops.c +++ b/source/blender/editors/space_action/action_ops.c @@ -21,16 +21,16 @@ * \ingroup spaction */ -#include <stdlib.h> #include <math.h> +#include <stdlib.h> #include "DNA_space_types.h" #include "ED_anim_api.h" #include "ED_markers.h" -#include "ED_transform.h" #include "ED_object.h" #include "ED_select_utils.h" +#include "ED_transform.h" #include "action_intern.h" diff --git a/source/blender/editors/space_action/action_select.c b/source/blender/editors/space_action/action_select.c index 4322e4277ad..173c2f1b5dc 100644 --- a/source/blender/editors/space_action/action_select.c +++ b/source/blender/editors/space_action/action_select.c @@ -20,10 +20,10 @@ * \ingroup spaction */ +#include <float.h> #include <math.h> #include <stdlib.h> #include <string.h> -#include <float.h> #include "MEM_guardedalloc.h" @@ -34,27 +34,27 @@ #include "DNA_anim_types.h" #include "DNA_gpencil_types.h" +#include "DNA_mask_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_mask_types.h" #include "RNA_access.h" #include "RNA_define.h" -#include "BKE_fcurve.h" -#include "BKE_nla.h" #include "BKE_context.h" +#include "BKE_fcurve.h" #include "BKE_gpencil.h" +#include "BKE_nla.h" -#include "UI_view2d.h" #include "UI_interface.h" +#include "UI_view2d.h" #include "ED_anim_api.h" #include "ED_gpencil.h" -#include "ED_mask.h" #include "ED_keyframes_draw.h" #include "ED_keyframes_edit.h" #include "ED_markers.h" +#include "ED_mask.h" #include "ED_screen.h" #include "ED_select_utils.h" diff --git a/source/blender/editors/space_action/space_action.c b/source/blender/editors/space_action/space_action.c index af59b56065c..64c81797bb4 100644 --- a/source/blender/editors/space_action/space_action.c +++ b/source/blender/editors/space_action/space_action.c @@ -21,8 +21,8 @@ * \ingroup spaction */ -#include <string.h> #include <stdio.h> +#include <string.h> #include "DNA_action_types.h" #include "DNA_collection_types.h" @@ -42,21 +42,21 @@ #include "RNA_enum_types.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" +#include "WM_types.h" #include "UI_interface.h" #include "UI_resources.h" #include "UI_view2d.h" -#include "ED_space_api.h" -#include "ED_screen.h" #include "ED_anim_api.h" #include "ED_markers.h" +#include "ED_screen.h" +#include "ED_space_api.h" #include "ED_time_scrub_ui.h" -#include "action_intern.h" /* own include */ #include "GPU_framebuffer.h" +#include "action_intern.h" /* own include */ /* ******************** default callbacks for action space ***************** */ diff --git a/source/blender/editors/space_api/spacetypes.c b/source/blender/editors/space_api/spacetypes.c index d34b1ccb899..44d64bd750a 100644 --- a/source/blender/editors/space_api/spacetypes.c +++ b/source/blender/editors/space_api/spacetypes.c @@ -38,10 +38,16 @@ #include "ED_anim_api.h" #include "ED_armature.h" +#include "ED_clip.h" #include "ED_curve.h" #include "ED_fileselect.h" +#include "ED_gizmo_library.h" #include "ED_gpencil.h" +#include "ED_lattice.h" +#include "ED_logic.h" #include "ED_markers.h" +#include "ED_mask.h" +#include "ED_mball.h" #include "ED_mesh.h" #include "ED_node.h" #include "ED_object.h" @@ -51,18 +57,12 @@ #include "ED_scene.h" #include "ED_screen.h" #include "ED_sculpt.h" -#include "ED_space_api.h" -#include "ED_sound.h" -#include "ED_uvedit.h" -#include "ED_userpref.h" -#include "ED_lattice.h" -#include "ED_mball.h" -#include "ED_logic.h" -#include "ED_clip.h" -#include "ED_mask.h" #include "ED_sequencer.h" -#include "ED_gizmo_library.h" +#include "ED_sound.h" +#include "ED_space_api.h" #include "ED_transform.h" +#include "ED_userpref.h" +#include "ED_uvedit.h" #include "io_ops.h" diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c index 21dfb3df771..587ba5b0b79 100644 --- a/source/blender/editors/space_buttons/buttons_context.c +++ b/source/blender/editors/space_buttons/buttons_context.c @@ -32,33 +32,33 @@ #include "BLT_translation.h" #include "DNA_armature_types.h" +#include "DNA_brush_types.h" #include "DNA_collection_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_world_types.h" -#include "DNA_brush_types.h" -#include "DNA_linestyle_types.h" #include "DNA_windowmanager_types.h" +#include "DNA_world_types.h" -#include "BKE_context.h" #include "BKE_action.h" +#include "BKE_context.h" #include "BKE_layer.h" +#include "BKE_linestyle.h" #include "BKE_material.h" #include "BKE_modifier.h" #include "BKE_paint.h" #include "BKE_particle.h" #include "BKE_screen.h" #include "BKE_texture.h" -#include "BKE_linestyle.h" #include "RNA_access.h" -#include "ED_buttons.h" #include "ED_armature.h" -#include "ED_screen.h" +#include "ED_buttons.h" #include "ED_physics.h" +#include "ED_screen.h" #include "UI_interface.h" #include "UI_resources.h" diff --git a/source/blender/editors/space_buttons/buttons_ops.c b/source/blender/editors/space_buttons/buttons_ops.c index 3ea6d183969..b393311e1fd 100644 --- a/source/blender/editors/space_buttons/buttons_ops.c +++ b/source/blender/editors/space_buttons/buttons_ops.c @@ -28,10 +28,10 @@ #include "DNA_userdef_types.h" -#include "BLI_utildefines.h" #include "BLI_fileops.h" #include "BLI_path_util.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" diff --git a/source/blender/editors/space_buttons/buttons_texture.c b/source/blender/editors/space_buttons/buttons_texture.c index 03c8fbb4e66..00818ac77b5 100644 --- a/source/blender/editors/space_buttons/buttons_texture.c +++ b/source/blender/editors/space_buttons/buttons_texture.c @@ -32,23 +32,23 @@ #include "BLT_translation.h" -#include "DNA_brush_types.h" #include "DNA_ID.h" +#include "DNA_brush_types.h" +#include "DNA_linestyle_types.h" #include "DNA_node_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 "DNA_screen_types.h" #include "DNA_space_types.h" -#include "DNA_linestyle_types.h" #include "DNA_windowmanager_types.h" #include "BKE_context.h" +#include "BKE_gpencil_modifier.h" #include "BKE_layer.h" #include "BKE_linestyle.h" #include "BKE_modifier.h" -#include "BKE_gpencil_modifier.h" #include "BKE_node.h" #include "BKE_paint.h" #include "BKE_particle.h" diff --git a/source/blender/editors/space_buttons/space_buttons.c b/source/blender/editors/space_buttons/space_buttons.c index 6d4cb65522e..2fd54db667b 100644 --- a/source/blender/editors/space_buttons/space_buttons.c +++ b/source/blender/editors/space_buttons/space_buttons.c @@ -21,8 +21,8 @@ * \ingroup spbuttons */ -#include <string.h> #include <stdio.h> +#include <string.h> #include "MEM_guardedalloc.h" @@ -32,13 +32,13 @@ #include "BKE_context.h" #include "BKE_screen.h" -#include "ED_space_api.h" #include "ED_screen.h" +#include "ED_space_api.h" #include "ED_view3d.h" /* To draw toolbar UI. */ #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" +#include "WM_types.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/space_clip/clip_buttons.c b/source/blender/editors/space_clip/clip_buttons.c index 6b9d3fd054a..dc85b3959e1 100644 --- a/source/blender/editors/space_clip/clip_buttons.c +++ b/source/blender/editors/space_clip/clip_buttons.c @@ -21,8 +21,8 @@ * \ingroup spclip */ -#include <string.h> #include <stdio.h> +#include <string.h> #include "MEM_guardedalloc.h" @@ -30,17 +30,17 @@ #include "DNA_screen_types.h" #include "DNA_space_types.h" -#include "BLI_utildefines.h" #include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_path_util.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" #include "BKE_context.h" -#include "BKE_screen.h" #include "BKE_movieclip.h" +#include "BKE_screen.h" #include "BKE_tracking.h" #include "DEG_depsgraph.h" @@ -57,8 +57,8 @@ #include "WM_api.h" #include "WM_types.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "clip_intern.h" /* own include */ diff --git a/source/blender/editors/space_clip/clip_dopesheet_draw.c b/source/blender/editors/space_clip/clip_dopesheet_draw.c index 72c140011a9..eba0f33d6cc 100644 --- a/source/blender/editors/space_clip/clip_dopesheet_draw.c +++ b/source/blender/editors/space_clip/clip_dopesheet_draw.c @@ -24,15 +24,15 @@ #include "DNA_movieclip_types.h" #include "DNA_scene_types.h" -#include "BLI_utildefines.h" #include "BLI_math.h" #include "BLI_rect.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_movieclip.h" -#include "ED_screen.h" #include "ED_clip.h" +#include "ED_screen.h" #include "WM_types.h" diff --git a/source/blender/editors/space_clip/clip_dopesheet_ops.c b/source/blender/editors/space_clip/clip_dopesheet_ops.c index fbe92195a65..cd95a00c62a 100644 --- a/source/blender/editors/space_clip/clip_dopesheet_ops.c +++ b/source/blender/editors/space_clip/clip_dopesheet_ops.c @@ -23,9 +23,9 @@ #include "DNA_scene_types.h" -#include "BLI_utildefines.h" #include "BLI_math.h" #include "BLI_rect.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_tracking.h" @@ -33,8 +33,8 @@ #include "WM_api.h" #include "WM_types.h" -#include "ED_screen.h" #include "ED_clip.h" +#include "ED_screen.h" #include "UI_interface.h" diff --git a/source/blender/editors/space_clip/clip_draw.c b/source/blender/editors/space_clip/clip_draw.c index 45502d1eb81..2a6cf4d5a55 100644 --- a/source/blender/editors/space_clip/clip_draw.c +++ b/source/blender/editors/space_clip/clip_draw.c @@ -28,24 +28,24 @@ #include "MEM_guardedalloc.h" #include "IMB_colormanagement.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" -#include "BLI_utildefines.h" #include "BLI_math.h" -#include "BLI_string.h" #include "BLI_math_base.h" #include "BLI_rect.h" +#include "BLI_string.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_image.h" #include "BKE_movieclip.h" #include "BKE_tracking.h" -#include "ED_screen.h" #include "ED_clip.h" -#include "ED_mask.h" #include "ED_gpencil.h" +#include "ED_mask.h" +#include "ED_screen.h" #include "BIF_glutil.h" diff --git a/source/blender/editors/space_clip/clip_editor.c b/source/blender/editors/space_clip/clip_editor.c index 1ac4e4a81a7..6336f1bff3a 100644 --- a/source/blender/editors/space_clip/clip_editor.c +++ b/source/blender/editors/space_clip/clip_editor.c @@ -21,10 +21,10 @@ * \ingroup spclip */ -#include <stddef.h> #include <errno.h> -#include <sys/types.h> #include <fcntl.h> +#include <stddef.h> +#include <sys/types.h> #ifndef WIN32 # include <unistd.h> @@ -36,11 +36,11 @@ #include "DNA_mask_types.h" -#include "BLI_utildefines.h" #include "BLI_fileops.h" #include "BLI_math.h" #include "BLI_rect.h" #include "BLI_task.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_global.h" @@ -51,12 +51,12 @@ #include "BKE_tracking.h" #include "IMB_colormanagement.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" -#include "ED_screen.h" #include "ED_clip.h" #include "ED_mask.h" +#include "ED_screen.h" #include "ED_select_utils.h" #include "WM_api.h" diff --git a/source/blender/editors/space_clip/clip_graph_draw.c b/source/blender/editors/space_clip/clip_graph_draw.c index 10bf8d93983..7f3d3f3d651 100644 --- a/source/blender/editors/space_clip/clip_graph_draw.c +++ b/source/blender/editors/space_clip/clip_graph_draw.c @@ -24,15 +24,15 @@ #include "DNA_movieclip_types.h" #include "DNA_scene_types.h" -#include "BLI_utildefines.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_movieclip.h" #include "BKE_tracking.h" -#include "ED_screen.h" #include "ED_clip.h" +#include "ED_screen.h" #include "GPU_immediate.h" #include "GPU_immediate_util.h" diff --git a/source/blender/editors/space_clip/clip_graph_ops.c b/source/blender/editors/space_clip/clip_graph_ops.c index 9547c65ffab..e974480a233 100644 --- a/source/blender/editors/space_clip/clip_graph_ops.c +++ b/source/blender/editors/space_clip/clip_graph_ops.c @@ -23,9 +23,9 @@ #include "DNA_scene_types.h" -#include "BLI_utildefines.h" #include "BLI_math.h" #include "BLI_rect.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_tracking.h" @@ -35,9 +35,9 @@ #include "WM_api.h" #include "WM_types.h" +#include "ED_clip.h" #include "ED_screen.h" #include "ED_select_utils.h" -#include "ED_clip.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/space_clip/clip_ops.c b/source/blender/editors/space_clip/clip_ops.c index 0f978b38e60..efc8c3bb7dd 100644 --- a/source/blender/editors/space_clip/clip_ops.c +++ b/source/blender/editors/space_clip/clip_ops.c @@ -22,8 +22,8 @@ */ #include <errno.h> -#include <sys/types.h> #include <fcntl.h> +#include <sys/types.h> #ifndef WIN32 # include <unistd.h> @@ -33,16 +33,16 @@ #include "MEM_guardedalloc.h" -#include "DNA_userdef_types.h" #include "DNA_scene_types.h" /* min/max frames */ +#include "DNA_userdef_types.h" -#include "BLI_utildefines.h" #include "BLI_fileops.h" -#include "BLI_path_util.h" #include "BLI_math.h" +#include "BLI_path_util.h" #include "BLI_rect.h" -#include "BLI_task.h" #include "BLI_string.h" +#include "BLI_task.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" @@ -57,11 +57,11 @@ #include "WM_api.h" #include "WM_types.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" -#include "ED_screen.h" #include "ED_clip.h" +#include "ED_screen.h" #include "UI_interface.h" diff --git a/source/blender/editors/space_clip/clip_toolbar.c b/source/blender/editors/space_clip/clip_toolbar.c index 4c4110759cd..1e3911863fc 100644 --- a/source/blender/editors/space_clip/clip_toolbar.c +++ b/source/blender/editors/space_clip/clip_toolbar.c @@ -38,8 +38,8 @@ #include "RNA_access.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" #include "ED_screen.h" #include "ED_undo.h" diff --git a/source/blender/editors/space_clip/clip_utils.c b/source/blender/editors/space_clip/clip_utils.c index 902229c0bba..4a0df454a78 100644 --- a/source/blender/editors/space_clip/clip_utils.c +++ b/source/blender/editors/space_clip/clip_utils.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 "BKE_animsys.h" #include "BKE_context.h" @@ -43,8 +43,8 @@ #include "WM_api.h" #include "WM_types.h" -#include "ED_screen.h" #include "ED_clip.h" +#include "ED_screen.h" #include "UI_interface.h" #include "UI_resources.h" diff --git a/source/blender/editors/space_clip/space_clip.c b/source/blender/editors/space_clip/space_clip.c index 3256ee3eb73..a273487eee9 100644 --- a/source/blender/editors/space_clip/space_clip.c +++ b/source/blender/editors/space_clip/space_clip.c @@ -21,43 +21,43 @@ * \ingroup spclip */ -#include <string.h> #include <stdio.h> +#include <string.h> -#include "DNA_scene_types.h" #include "DNA_mask_types.h" #include "DNA_movieclip_types.h" +#include "DNA_scene_types.h" #include "DNA_view3d_types.h" /* for pivot point */ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_lib_id.h" #include "BKE_movieclip.h" -#include "BKE_tracking.h" #include "BKE_screen.h" +#include "BKE_tracking.h" #include "IMB_imbuf_types.h" #include "ED_anim_api.h" /* for timeline cursor drawing */ +#include "ED_clip.h" #include "ED_mask.h" -#include "ED_space_api.h" #include "ED_screen.h" -#include "ED_time_scrub_ui.h" #include "ED_select_utils.h" -#include "ED_clip.h" +#include "ED_space_api.h" +#include "ED_time_scrub_ui.h" #include "ED_transform.h" #include "ED_uvedit.h" /* just for ED_image_draw_cursor */ #include "IMB_imbuf.h" +#include "GPU_framebuffer.h" #include "GPU_glew.h" #include "GPU_matrix.h" -#include "GPU_framebuffer.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/space_clip/tracking_ops.c b/source/blender/editors/space_clip/tracking_ops.c index 3c25be9fe1e..f88f6113b54 100644 --- a/source/blender/editors/space_clip/tracking_ops.c +++ b/source/blender/editors/space_clip/tracking_ops.c @@ -26,23 +26,23 @@ #include "DNA_screen_types.h" #include "DNA_space_types.h" -#include "BLI_utildefines.h" +#include "BLI_blenlib.h" #include "BLI_ghash.h" #include "BLI_math.h" -#include "BLI_blenlib.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_movieclip.h" -#include "BKE_tracking.h" #include "BKE_report.h" +#include "BKE_tracking.h" #include "DEG_depsgraph.h" #include "WM_api.h" #include "WM_types.h" -#include "ED_screen.h" #include "ED_clip.h" +#include "ED_screen.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/space_clip/tracking_ops_detect.c b/source/blender/editors/space_clip/tracking_ops_detect.c index a9c97258def..dd620e85324 100644 --- a/source/blender/editors/space_clip/tracking_ops_detect.c +++ b/source/blender/editors/space_clip/tracking_ops_detect.c @@ -31,16 +31,16 @@ #include "BKE_context.h" #include "BKE_movieclip.h" -#include "BKE_tracking.h" #include "BKE_report.h" +#include "BKE_tracking.h" #include "WM_api.h" #include "WM_types.h" #include "ED_clip.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/space_clip/tracking_ops_orient.c b/source/blender/editors/space_clip/tracking_ops_orient.c index 8bc77cf82cb..25e30c116c5 100644 --- a/source/blender/editors/space_clip/tracking_ops_orient.c +++ b/source/blender/editors/space_clip/tracking_ops_orient.c @@ -28,15 +28,15 @@ #include "DNA_screen_types.h" #include "DNA_space_types.h" -#include "BLI_utildefines.h" #include "BLI_math.h" +#include "BLI_utildefines.h" -#include "BKE_context.h" #include "BKE_constraint.h" -#include "BKE_tracking.h" +#include "BKE_context.h" #include "BKE_layer.h" #include "BKE_object.h" #include "BKE_report.h" +#include "BKE_tracking.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/editors/space_clip/tracking_ops_plane.c b/source/blender/editors/space_clip/tracking_ops_plane.c index 329dc8be894..0cf0e85929c 100644 --- a/source/blender/editors/space_clip/tracking_ops_plane.c +++ b/source/blender/editors/space_clip/tracking_ops_plane.c @@ -26,12 +26,12 @@ #include "DNA_screen_types.h" #include "DNA_space_types.h" -#include "BLI_utildefines.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "BKE_context.h" -#include "BKE_tracking.h" #include "BKE_report.h" +#include "BKE_tracking.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/space_clip/tracking_ops_solve.c b/source/blender/editors/space_clip/tracking_ops_solve.c index b6c5c087025..c18207d7045 100644 --- a/source/blender/editors/space_clip/tracking_ops_solve.c +++ b/source/blender/editors/space_clip/tracking_ops_solve.c @@ -28,8 +28,8 @@ #include "DNA_screen_types.h" #include "DNA_space_types.h" -#include "BLI_utildefines.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_global.h" diff --git a/source/blender/editors/space_clip/tracking_ops_track.c b/source/blender/editors/space_clip/tracking_ops_track.c index f579b2a08e2..c14895f8483 100644 --- a/source/blender/editors/space_clip/tracking_ops_track.c +++ b/source/blender/editors/space_clip/tracking_ops_track.c @@ -23,21 +23,21 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_math.h" +#include "BLI_utildefines.h" -#include "BKE_main.h" #include "BKE_context.h" -#include "BKE_movieclip.h" -#include "BKE_tracking.h" #include "BKE_global.h" +#include "BKE_main.h" +#include "BKE_movieclip.h" #include "BKE_report.h" +#include "BKE_tracking.h" #include "WM_api.h" #include "WM_types.h" -#include "ED_screen.h" #include "ED_clip.h" +#include "ED_screen.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/space_clip/tracking_select.c b/source/blender/editors/space_clip/tracking_select.c index 36e529e47d0..2166cff4883 100644 --- a/source/blender/editors/space_clip/tracking_select.c +++ b/source/blender/editors/space_clip/tracking_select.c @@ -26,10 +26,10 @@ #include "DNA_movieclip_types.h" #include "DNA_scene_types.h" -#include "BLI_utildefines.h" +#include "BLI_lasso_2d.h" #include "BLI_math.h" #include "BLI_rect.h" -#include "BLI_lasso_2d.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_tracking.h" @@ -49,8 +49,8 @@ #include "DEG_depsgraph.h" -#include "tracking_ops_intern.h" /* own include */ #include "clip_intern.h" /* own include */ +#include "tracking_ops_intern.h" /* own include */ static float dist_to_crns(float co[2], float pos[2], float crns[4][2]); diff --git a/source/blender/editors/space_console/console_draw.c b/source/blender/editors/space_console/console_draw.c index ee1496c96bb..6c56e8dfb79 100644 --- a/source/blender/editors/space_console/console_draw.c +++ b/source/blender/editors/space_console/console_draw.c @@ -23,8 +23,8 @@ #include "BLI_blenlib.h" #include "BLI_utildefines.h" -#include "DNA_space_types.h" #include "DNA_screen_types.h" +#include "DNA_space_types.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/space_console/console_ops.c b/source/blender/editors/space_console/console_ops.c index abb566aa39b..58d6fb425b0 100644 --- a/source/blender/editors/space_console/console_ops.c +++ b/source/blender/editors/space_console/console_ops.c @@ -18,30 +18,30 @@ * \ingroup spconsole */ +#include <ctype.h> /* ispunct */ #include <stdlib.h> #include <string.h> -#include <ctype.h> /* ispunct */ #include <sys/stat.h> #include "MEM_guardedalloc.h" #include "DNA_userdef_types.h" -#include "BLI_utildefines.h" +#include "BLI_dynstr.h" #include "BLI_listbase.h" +#include "BLI_math.h" +#include "BLI_string.h" #include "BLI_string_cursor_utf8.h" #include "BLI_string_utf8.h" -#include "BLI_string.h" -#include "BLI_dynstr.h" -#include "BLI_math.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "WM_api.h" #include "WM_types.h" -#include "UI_view2d.h" #include "ED_screen.h" +#include "UI_view2d.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/space_console/space_console.c b/source/blender/editors/space_console/space_console.c index eb83f9963b0..66aa92275b4 100644 --- a/source/blender/editors/space_console/space_console.c +++ b/source/blender/editors/space_console/space_console.c @@ -18,20 +18,20 @@ * \ingroup spconsole */ -#include <string.h> #include <stdio.h> +#include <string.h> #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" #include "BLI_utildefines.h" -#include "BKE_global.h" #include "BKE_context.h" +#include "BKE_global.h" #include "BKE_screen.h" -#include "ED_space_api.h" #include "ED_screen.h" +#include "ED_space_api.h" #include "RNA_access.h" @@ -41,8 +41,8 @@ #include "UI_resources.h" #include "UI_view2d.h" -#include "console_intern.h" // own include #include "GPU_framebuffer.h" +#include "console_intern.h" // own include /* ******************** default callbacks for console space ***************** */ diff --git a/source/blender/editors/space_file/file_draw.c b/source/blender/editors/space_file/file_draw.c index d7682a41570..5f5aced292d 100644 --- a/source/blender/editors/space_file/file_draw.c +++ b/source/blender/editors/space_file/file_draw.c @@ -21,14 +21,14 @@ * \ingroup spfile */ +#include <errno.h> #include <math.h> #include <string.h> -#include <errno.h> #include "BLI_blenlib.h" #include "BLI_fileops_types.h" -#include "BLI_utildefines.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #ifdef WIN32 # include "BLI_winstuff.h" diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c index 169abfb9a10..c17ca31a7df 100644 --- a/source/blender/editors/space_file/file_ops.c +++ b/source/blender/editors/space_file/file_ops.c @@ -40,8 +40,8 @@ # include "BLI_winstuff.h" #endif -#include "ED_screen.h" #include "ED_fileselect.h" +#include "ED_screen.h" #include "ED_select_utils.h" #include "UI_interface.h" @@ -62,11 +62,11 @@ #include "filelist.h" #include "fsmenu.h" -#include <stdlib.h> -#include <string.h> -#include <stdio.h> #include <ctype.h> #include <errno.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> /* ---------- FILE SELECTION ------------ */ static FileSelection find_file_mouse_rect(SpaceFile *sfile, diff --git a/source/blender/editors/space_file/file_utils.c b/source/blender/editors/space_file/file_utils.c index 61ddd7d63f2..452f2f704cf 100644 --- a/source/blender/editors/space_file/file_utils.c +++ b/source/blender/editors/space_file/file_utils.c @@ -18,15 +18,15 @@ * \ingroup spfile */ -#include "BLI_rect.h" #include "BLI_listbase.h" +#include "BLI_rect.h" #include "BLO_readfile.h" #include "BKE_context.h" -#include "ED_screen.h" #include "ED_fileselect.h" +#include "ED_screen.h" #include "WM_types.h" diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c index 1fc0866bd9f..6bbe54e2f5c 100644 --- a/source/blender/editors/space_file/filelist.c +++ b/source/blender/editors/space_file/filelist.c @@ -23,8 +23,8 @@ /* global includes */ -#include <stdlib.h> #include <math.h> +#include <stdlib.h> #include <string.h> #include <sys/stat.h> #include <time.h> @@ -32,8 +32,8 @@ #ifndef WIN32 # include <unistd.h> #else -# include <io.h> # include <direct.h> +# include <io.h> #endif #include "MEM_guardedalloc.h" @@ -75,8 +75,8 @@ #include "WM_api.h" #include "WM_types.h" -#include "UI_resources.h" #include "UI_interface_icons.h" +#include "UI_resources.h" #include "atomic_ops.h" diff --git a/source/blender/editors/space_file/filesel.c b/source/blender/editors/space_file/filesel.c index 6c0f79f0f5c..67c0fae3565 100644 --- a/source/blender/editors/space_file/filesel.c +++ b/source/blender/editors/space_file/filesel.c @@ -21,33 +21,33 @@ * \ingroup spfile */ -#include <string.h> -#include <stdio.h> #include <math.h> +#include <stdio.h> +#include <string.h> #include <sys/stat.h> #include <sys/types.h> /* path/file handling stuff */ #ifdef WIN32 -# include <io.h> -# include <direct.h> # include "BLI_winstuff.h" +# include <direct.h> +# include <io.h> #else -# include <unistd.h> -# include <sys/times.h> # include <dirent.h> +# include <sys/times.h> +# include <unistd.h> #endif -#include "DNA_space_types.h" #include "DNA_screen_types.h" +#include "DNA_space_types.h" #include "DNA_userdef_types.h" #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_fnmatch.h" +#include "BLI_utildefines.h" #include "BLO_readfile.h" diff --git a/source/blender/editors/space_file/fsmenu.c b/source/blender/editors/space_file/fsmenu.c index 4f3fc997074..08b800df7dd 100644 --- a/source/blender/editors/space_file/fsmenu.c +++ b/source/blender/editors/space_file/fsmenu.c @@ -21,16 +21,16 @@ * \ingroup spfile */ +#include <math.h> +#include <stdio.h> #include <stdlib.h> #include <string.h> -#include <stdio.h> -#include <math.h> #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_blenlib.h" #include "BLI_ghash.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" @@ -43,22 +43,22 @@ # include <windows.h> /* For SHGetSpecialFolderPath, has to be done before BLI_winstuff * because 'near' is disabled through BLI_windstuff. */ -# include <shlobj.h> # include "BLI_winstuff.h" +# include <shlobj.h> #endif -#include "WM_api.h" -#include "WM_types.h" #include "UI_interface_icons.h" #include "UI_resources.h" +#include "WM_api.h" +#include "WM_types.h" #ifdef __APPLE__ # include <Carbon/Carbon.h> #endif /* __APPLE__ */ #ifdef __linux__ -# include <mntent.h> # include "BLI_fileops_types.h" +# include <mntent.h> #endif #include "fsmenu.h" /* include ourselves */ diff --git a/source/blender/editors/space_file/space_file.c b/source/blender/editors/space_file/space_file.c index 50ee64da9c8..c3159d38e7e 100644 --- a/source/blender/editors/space_file/space_file.c +++ b/source/blender/editors/space_file/space_file.c @@ -21,8 +21,8 @@ * \ingroup spfile */ -#include <string.h> #include <stdio.h> +#include <string.h> #include "MEM_guardedalloc.h" @@ -31,18 +31,18 @@ #include "BKE_appdir.h" #include "BKE_context.h" -#include "BKE_screen.h" #include "BKE_global.h" +#include "BKE_screen.h" #include "RNA_access.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" +#include "WM_types.h" -#include "ED_space_api.h" -#include "ED_screen.h" #include "ED_fileselect.h" +#include "ED_screen.h" +#include "ED_space_api.h" #include "IMB_imbuf_types.h" #include "IMB_thumbs.h" @@ -50,10 +50,10 @@ #include "UI_resources.h" #include "UI_view2d.h" +#include "GPU_framebuffer.h" #include "file_intern.h" // own include -#include "fsmenu.h" #include "filelist.h" -#include "GPU_framebuffer.h" +#include "fsmenu.h" static ARegion *file_execute_region_ensure(ScrArea *sa, ARegion *ar_prev) { diff --git a/source/blender/editors/space_graph/graph_buttons.c b/source/blender/editors/space_graph/graph_buttons.c index e1edb07ab68..c2aa74a695e 100644 --- a/source/blender/editors/space_graph/graph_buttons.c +++ b/source/blender/editors/space_graph/graph_buttons.c @@ -21,10 +21,10 @@ * \ingroup spgraph */ -#include <string.h> -#include <stdio.h> -#include <math.h> #include <float.h> +#include <math.h> +#include <stdio.h> +#include <string.h> #include "DNA_anim_types.h" #include "DNA_object_types.h" @@ -32,8 +32,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_math.h" #include "BLI_utildefines.h" #include "BLT_translation.h" @@ -42,8 +42,8 @@ #include "BKE_context.h" #include "BKE_curve.h" #include "BKE_fcurve.h" -#include "BKE_main.h" #include "BKE_global.h" +#include "BKE_main.h" #include "BKE_screen.h" #include "BKE_unit.h" diff --git a/source/blender/editors/space_graph/graph_draw.c b/source/blender/editors/space_graph/graph_draw.c index f86ca60cefe..eac87caf777 100644 --- a/source/blender/editors/space_graph/graph_draw.c +++ b/source/blender/editors/space_graph/graph_draw.c @@ -20,10 +20,10 @@ * \ingroup spgraph */ -#include <stdio.h> +#include <float.h> #include <math.h> +#include <stdio.h> #include <string.h> -#include <float.h> #include "BLI_blenlib.h" #include "BLI_math.h" @@ -32,8 +32,8 @@ #include "DNA_anim_types.h" #include "DNA_screen_types.h" #include "DNA_space_types.h" -#include "DNA_windowmanager_types.h" #include "DNA_userdef_types.h" +#include "DNA_windowmanager_types.h" #include "BKE_context.h" #include "BKE_curve.h" diff --git a/source/blender/editors/space_graph/graph_edit.c b/source/blender/editors/space_graph/graph_edit.c index e9f9249e608..8c64fb5bb40 100644 --- a/source/blender/editors/space_graph/graph_edit.c +++ b/source/blender/editors/space_graph/graph_edit.c @@ -21,10 +21,10 @@ * \ingroup spgraph */ +#include <float.h> #include <math.h> #include <stdlib.h> #include <string.h> -#include <float.h> #ifdef WITH_AUDASPACE # include <AUD_Special.h> @@ -54,16 +54,16 @@ #include "DEG_depsgraph_build.h" -#include "UI_view2d.h" #include "UI_interface.h" +#include "UI_view2d.h" #include "ED_anim_api.h" -#include "ED_keyframing.h" #include "ED_keyframes_edit.h" +#include "ED_keyframing.h" +#include "ED_markers.h" #include "ED_numinput.h" #include "ED_screen.h" #include "ED_transform.h" -#include "ED_markers.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/space_graph/graph_ops.c b/source/blender/editors/space_graph/graph_ops.c index 344688bbd21..de25a2d990d 100644 --- a/source/blender/editors/space_graph/graph_ops.c +++ b/source/blender/editors/space_graph/graph_ops.c @@ -21,14 +21,14 @@ * \ingroup spgraph */ -#include <stdlib.h> #include <math.h> +#include <stdlib.h> #include "DNA_scene_types.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_math_base.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_global.h" @@ -38,10 +38,10 @@ #include "ED_anim_api.h" #include "ED_markers.h" +#include "ED_object.h" #include "ED_screen.h" #include "ED_select_utils.h" #include "ED_transform.h" -#include "ED_object.h" #include "graph_intern.h" diff --git a/source/blender/editors/space_graph/graph_select.c b/source/blender/editors/space_graph/graph_select.c index 94870cf0d81..a2e9ba86dec 100644 --- a/source/blender/editors/space_graph/graph_select.c +++ b/source/blender/editors/space_graph/graph_select.c @@ -20,29 +20,29 @@ * \ingroup spgraph */ +#include <float.h> #include <math.h> #include <stdlib.h> #include <string.h> -#include <float.h> #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" +#include "BLI_lasso_2d.h" #include "BLI_math.h" #include "BLI_utildefines.h" -#include "BLI_lasso_2d.h" #include "DNA_anim_types.h" -#include "DNA_screen_types.h" #include "DNA_scene_types.h" +#include "DNA_screen_types.h" #include "DNA_space_types.h" #include "RNA_access.h" #include "RNA_define.h" +#include "BKE_context.h" #include "BKE_fcurve.h" #include "BKE_nla.h" -#include "BKE_context.h" #include "UI_view2d.h" diff --git a/source/blender/editors/space_graph/graph_utils.c b/source/blender/editors/space_graph/graph_utils.c index b95ab48189c..0af94904ba6 100644 --- a/source/blender/editors/space_graph/graph_utils.c +++ b/source/blender/editors/space_graph/graph_utils.c @@ -21,14 +21,14 @@ * \ingroup spgraph */ -#include <string.h> -#include <stdio.h> -#include <math.h> #include <float.h> +#include <math.h> +#include <stdio.h> +#include <string.h> #include "DNA_anim_types.h" -#include "DNA_space_types.h" #include "DNA_screen_types.h" +#include "DNA_space_types.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/space_graph/space_graph.c b/source/blender/editors/space_graph/space_graph.c index 330d309411e..05edfccd6a8 100644 --- a/source/blender/editors/space_graph/space_graph.c +++ b/source/blender/editors/space_graph/space_graph.c @@ -21,8 +21,8 @@ * \ingroup spgraph */ -#include <string.h> #include <stdio.h> +#include <string.h> #include "DNA_anim_types.h" #include "DNA_collection_types.h" @@ -38,27 +38,27 @@ #include "BKE_fcurve.h" #include "BKE_screen.h" -#include "ED_space_api.h" -#include "ED_screen.h" #include "ED_anim_api.h" #include "ED_markers.h" +#include "ED_screen.h" +#include "ED_space_api.h" #include "ED_time_scrub_ui.h" +#include "GPU_framebuffer.h" #include "GPU_immediate.h" #include "GPU_state.h" -#include "GPU_framebuffer.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" +#include "WM_types.h" #include "RNA_access.h" #include "RNA_define.h" #include "RNA_enum_types.h" +#include "UI_interface.h" #include "UI_resources.h" #include "UI_view2d.h" -#include "UI_interface.h" #include "graph_intern.h" // own include diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c index 54bd2f37f3a..873091bd68d 100644 --- a/source/blender/editors/space_image/image_buttons.c +++ b/source/blender/editors/space_image/image_buttons.c @@ -21,8 +21,8 @@ * \ingroup spimage */ -#include <string.h> #include <stdio.h> +#include <string.h> #include "DNA_node_types.h" #include "DNA_scene_types.h" @@ -37,8 +37,8 @@ #include "BKE_context.h" #include "BKE_image.h" #include "BKE_node.h" -#include "BKE_screen.h" #include "BKE_scene.h" +#include "BKE_screen.h" #include "RE_pipeline.h" @@ -47,8 +47,8 @@ #include "IMB_imbuf_types.h" #include "ED_gpencil.h" -#include "ED_screen.h" #include "ED_image.h" +#include "ED_screen.h" #include "RNA_access.h" diff --git a/source/blender/editors/space_image/image_draw.c b/source/blender/editors/space_image/image_draw.c index d1b2c2330ac..a58abb2fbd5 100644 --- a/source/blender/editors/space_image/image_draw.c +++ b/source/blender/editors/space_image/image_draw.c @@ -27,26 +27,26 @@ #include "MEM_guardedalloc.h" +#include "DNA_brush_types.h" #include "DNA_camera_types.h" +#include "DNA_mask_types.h" #include "DNA_object_types.h" -#include "DNA_space_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" -#include "DNA_brush_types.h" -#include "DNA_mask_types.h" +#include "DNA_space_types.h" #include "PIL_time.h" #include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_rect.h" -#include "BLI_threads.h" #include "BLI_string.h" +#include "BLI_threads.h" #include "BLI_utildefines.h" +#include "IMB_colormanagement.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" -#include "IMB_colormanagement.h" #include "IMB_moviecache.h" #include "BKE_context.h" @@ -72,8 +72,8 @@ #include "UI_resources.h" #include "UI_view2d.h" -#include "RE_pipeline.h" #include "RE_engine.h" +#include "RE_pipeline.h" #include "image_intern.h" diff --git a/source/blender/editors/space_image/image_edit.c b/source/blender/editors/space_image/image_edit.c index 9d07780f756..99190fa2d39 100644 --- a/source/blender/editors/space_image/image_edit.c +++ b/source/blender/editors/space_image/image_edit.c @@ -26,8 +26,8 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BLI_rect.h" #include "BLI_listbase.h" +#include "BLI_rect.h" #include "BKE_colortools.h" #include "BKE_context.h" diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index 395329e5f6e..0f823933c24 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -21,11 +21,11 @@ * \ingroup spimage */ -#include <stddef.h> -#include <string.h> +#include <errno.h> #include <fcntl.h> +#include <stddef.h> #include <stdlib.h> -#include <errno.h> +#include <string.h> #ifndef WIN32 # include <unistd.h> #else @@ -46,31 +46,31 @@ #include "BLT_translation.h" #include "DNA_camera_types.h" -#include "DNA_object_types.h" #include "DNA_node_types.h" +#include "DNA_object_types.h" #include "DNA_packedFile_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" #include "BKE_colortools.h" #include "BKE_context.h" +#include "BKE_global.h" #include "BKE_icons.h" #include "BKE_image.h" #include "BKE_image_save.h" -#include "BKE_global.h" #include "BKE_lib_id.h" #include "BKE_main.h" #include "BKE_packedFile.h" #include "BKE_paint.h" #include "BKE_report.h" -#include "BKE_screen.h" #include "BKE_scene.h" +#include "BKE_screen.h" #include "DEG_depsgraph.h" #include "GPU_draw.h" -#include "GPU_state.h" #include "GPU_immediate.h" +#include "GPU_state.h" #include "IMB_colormanagement.h" #include "IMB_imbuf.h" @@ -90,8 +90,8 @@ #include "ED_render.h" #include "ED_screen.h" #include "ED_space_api.h" -#include "ED_uvedit.h" #include "ED_util.h" +#include "ED_uvedit.h" #include "UI_interface.h" #include "UI_resources.h" diff --git a/source/blender/editors/space_image/image_undo.c b/source/blender/editors/space_image/image_undo.c index eac330b4ff2..1394c05d7bc 100644 --- a/source/blender/editors/space_image/image_undo.c +++ b/source/blender/editors/space_image/image_undo.c @@ -34,16 +34,16 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" +#include "BLI_math.h" #include "BLI_threads.h" +#include "BLI_utildefines.h" #include "DNA_image_types.h" -#include "DNA_windowmanager_types.h" #include "DNA_object_types.h" #include "DNA_screen_types.h" #include "DNA_space_types.h" +#include "DNA_windowmanager_types.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" @@ -55,10 +55,10 @@ #include "DEG_depsgraph.h" +#include "ED_object.h" #include "ED_paint.h" #include "ED_undo.h" #include "ED_util.h" -#include "ED_object.h" #include "GPU_draw.h" diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c index 1fff40ab73a..a9cbebc5655 100644 --- a/source/blender/editors/space_image/space_image.c +++ b/source/blender/editors/space_image/space_image.c @@ -22,12 +22,12 @@ */ #include "DNA_gpencil_types.h" -#include "DNA_mesh_types.h" +#include "DNA_image_types.h" #include "DNA_mask_types.h" +#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_image_types.h" #include "MEM_guardedalloc.h" @@ -59,23 +59,23 @@ #include "ED_mesh.h" #include "ED_node.h" #include "ED_render.h" -#include "ED_space_api.h" #include "ED_screen.h" -#include "ED_uvedit.h" +#include "ED_space_api.h" #include "ED_transform.h" +#include "ED_uvedit.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" +#include "WM_types.h" -#include "UI_resources.h" #include "UI_interface.h" +#include "UI_resources.h" #include "UI_view2d.h" -#include "image_intern.h" -#include "GPU_framebuffer.h" #include "GPU_batch_presets.h" +#include "GPU_framebuffer.h" #include "GPU_viewport.h" +#include "image_intern.h" /* TODO(fclem) remove bad level calls */ #include "../draw/DRW_engine.h" diff --git a/source/blender/editors/space_info/info_draw.c b/source/blender/editors/space_info/info_draw.c index 60170276a16..2a3f6d6e365 100644 --- a/source/blender/editors/space_info/info_draw.c +++ b/source/blender/editors/space_info/info_draw.c @@ -21,23 +21,23 @@ * \ingroup spinfo */ -#include <string.h> #include <limits.h> +#include <string.h> #include "BLI_utildefines.h" -#include "DNA_space_types.h" #include "DNA_screen_types.h" +#include "DNA_space_types.h" #include "BKE_report.h" -#include "UI_resources.h" #include "UI_interface.h" +#include "UI_resources.h" #include "UI_view2d.h" +#include "GPU_framebuffer.h" #include "info_intern.h" #include "textview.h" -#include "GPU_framebuffer.h" static enum eTextViewContext_LineFlag report_line_data(TextViewContext *tvc, uchar fg[4], diff --git a/source/blender/editors/space_info/info_ops.c b/source/blender/editors/space_info/info_ops.c index 430cd95cdd2..30f36509b41 100644 --- a/source/blender/editors/space_info/info_ops.c +++ b/source/blender/editors/space_info/info_ops.c @@ -21,8 +21,8 @@ * \ingroup spinfo */ -#include <string.h> #include <stdio.h> +#include <string.h> #include "DNA_packedFile_types.h" #include "DNA_space_types.h" diff --git a/source/blender/editors/space_info/info_report.c b/source/blender/editors/space_info/info_report.c index 303e2bbaec9..7499c057950 100644 --- a/source/blender/editors/space_info/info_report.c +++ b/source/blender/editors/space_info/info_report.c @@ -18,9 +18,9 @@ * \ingroup spinfo */ +#include <limits.h> #include <stdlib.h> #include <string.h> -#include <limits.h> #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/space_info/info_stats.c b/source/blender/editors/space_info/info_stats.c index dd74e1a8ccc..78bc0961cb3 100644 --- a/source/blender/editors/space_info/info_stats.c +++ b/source/blender/editors/space_info/info_stats.c @@ -44,21 +44,21 @@ #include "BKE_blender_version.h" #include "BKE_curve.h" #include "BKE_displist.h" +#include "BKE_editmesh.h" +#include "BKE_gpencil.h" #include "BKE_key.h" #include "BKE_layer.h" #include "BKE_main.h" +#include "BKE_object.h" #include "BKE_paint.h" #include "BKE_particle.h" -#include "BKE_editmesh.h" -#include "BKE_object.h" -#include "BKE_gpencil.h" #include "BKE_scene.h" #include "BKE_subdiv_ccg.h" #include "DEG_depsgraph_query.h" -#include "ED_info.h" #include "ED_armature.h" +#include "ED_info.h" #include "GPU_extensions.h" diff --git a/source/blender/editors/space_info/space_info.c b/source/blender/editors/space_info/space_info.c index 789a0d8ea08..58ce3316c4b 100644 --- a/source/blender/editors/space_info/space_info.c +++ b/source/blender/editors/space_info/space_info.c @@ -21,8 +21,8 @@ * \ingroup spinfo */ -#include <string.h> #include <stdio.h> +#include <string.h> #include "MEM_guardedalloc.h" @@ -34,22 +34,22 @@ #include "BKE_context.h" #include "BKE_screen.h" -#include "ED_space_api.h" #include "ED_screen.h" +#include "ED_space_api.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" +#include "WM_types.h" #include "RNA_access.h" -#include "UI_resources.h" #include "UI_interface.h" +#include "UI_resources.h" #include "UI_view2d.h" -#include "info_intern.h" /* own include */ #include "BLO_readfile.h" #include "GPU_framebuffer.h" +#include "info_intern.h" /* own include */ /* ******************** default callbacks for info space ***************** */ diff --git a/source/blender/editors/space_info/textview.c b/source/blender/editors/space_info/textview.c index d7f2cb9ce1f..d9af8555f04 100644 --- a/source/blender/editors/space_info/textview.c +++ b/source/blender/editors/space_info/textview.c @@ -23,8 +23,8 @@ #include "BLF_api.h" #include "BLI_math.h" -#include "BLI_utildefines.h" #include "BLI_string_utf8.h" +#include "BLI_utildefines.h" #include "GPU_immediate.h" #include "GPU_state.h" diff --git a/source/blender/editors/space_nla/nla_buttons.c b/source/blender/editors/space_nla/nla_buttons.c index 315fa1d12aa..ca7f8791f75 100644 --- a/source/blender/editors/space_nla/nla_buttons.c +++ b/source/blender/editors/space_nla/nla_buttons.c @@ -21,10 +21,10 @@ * \ingroup spnla */ -#include <string.h> -#include <stdio.h> -#include <math.h> #include <float.h> +#include <math.h> +#include <stdio.h> +#include <string.h> #include "DNA_anim_types.h" @@ -36,8 +36,8 @@ #include "BLT_translation.h" -#include "BKE_nla.h" #include "BKE_context.h" +#include "BKE_nla.h" #include "BKE_screen.h" #include "WM_api.h" diff --git a/source/blender/editors/space_nla/nla_channels.c b/source/blender/editors/space_nla/nla_channels.c index b97267dc2a8..a69aed38cab 100644 --- a/source/blender/editors/space_nla/nla_channels.c +++ b/source/blender/editors/space_nla/nla_channels.c @@ -21,10 +21,10 @@ * \ingroup spnla */ -#include <string.h> +#include <math.h> #include <stdio.h> #include <stdlib.h> -#include <math.h> +#include <string.h> #include "DNA_anim_types.h" #include "DNA_object_types.h" @@ -34,12 +34,12 @@ #include "BLI_utildefines.h" #include "BKE_animsys.h" -#include "BKE_nla.h" #include "BKE_context.h" #include "BKE_global.h" +#include "BKE_nla.h" +#include "BKE_report.h" #include "BKE_scene.h" #include "BKE_screen.h" -#include "BKE_report.h" #include "ED_anim_api.h" #include "ED_keyframes_edit.h" diff --git a/source/blender/editors/space_nla/nla_draw.c b/source/blender/editors/space_nla/nla_draw.c index 56176c1cb92..4ccf752a916 100644 --- a/source/blender/editors/space_nla/nla_draw.c +++ b/source/blender/editors/space_nla/nla_draw.c @@ -21,11 +21,11 @@ * \ingroup spnla */ -#include <string.h> +#include <float.h> +#include <math.h> #include <stdio.h> #include <stdlib.h> -#include <math.h> -#include <float.h> +#include <string.h> #include "DNA_anim_types.h" #include "DNA_node_types.h" @@ -37,9 +37,9 @@ #include "BLI_dlrbTree.h" #include "BLI_utildefines.h" +#include "BKE_context.h" #include "BKE_fcurve.h" #include "BKE_nla.h" -#include "BKE_context.h" #include "BKE_screen.h" #include "ED_anim_api.h" @@ -55,8 +55,8 @@ #include "UI_resources.h" #include "UI_view2d.h" -#include "nla_private.h" #include "nla_intern.h" /* own include */ +#include "nla_private.h" /* *********************************************** */ /* Strips */ diff --git a/source/blender/editors/space_nla/nla_edit.c b/source/blender/editors/space_nla/nla_edit.c index f15e26e1b0d..2427001657a 100644 --- a/source/blender/editors/space_nla/nla_edit.c +++ b/source/blender/editors/space_nla/nla_edit.c @@ -21,9 +21,9 @@ * \ingroup spnla */ -#include <string.h> -#include <stdio.h> #include <math.h> +#include <stdio.h> +#include <string.h> #include "DNA_anim_types.h" #include "DNA_object_types.h" diff --git a/source/blender/editors/space_nla/nla_ops.c b/source/blender/editors/space_nla/nla_ops.c index 55470388e22..2e32c496170 100644 --- a/source/blender/editors/space_nla/nla_ops.c +++ b/source/blender/editors/space_nla/nla_ops.c @@ -21,8 +21,8 @@ * \ingroup spnla */ -#include <string.h> #include <stdio.h> +#include <string.h> #include "DNA_scene_types.h" diff --git a/source/blender/editors/space_nla/nla_select.c b/source/blender/editors/space_nla/nla_select.c index b8d5b17e26c..09abfc300c7 100644 --- a/source/blender/editors/space_nla/nla_select.c +++ b/source/blender/editors/space_nla/nla_select.c @@ -21,8 +21,8 @@ * \ingroup spnla */ -#include <string.h> #include <stdio.h> +#include <string.h> #include "DNA_anim_types.h" #include "DNA_scene_types.h" @@ -31,8 +31,8 @@ #include "BLI_blenlib.h" -#include "BKE_nla.h" #include "BKE_context.h" +#include "BKE_nla.h" #include "BKE_screen.h" #include "ED_anim_api.h" @@ -46,8 +46,8 @@ #include "WM_api.h" #include "WM_types.h" -#include "UI_view2d.h" #include "UI_interface.h" +#include "UI_view2d.h" #include "nla_intern.h" // own include diff --git a/source/blender/editors/space_nla/space_nla.c b/source/blender/editors/space_nla/space_nla.c index e04338b41fc..c4e1431ee26 100644 --- a/source/blender/editors/space_nla/space_nla.c +++ b/source/blender/editors/space_nla/space_nla.c @@ -21,8 +21,8 @@ * \ingroup spnla */ -#include <string.h> #include <stdio.h> +#include <string.h> #include "DNA_anim_types.h" #include "DNA_collection_types.h" @@ -36,15 +36,15 @@ #include "BKE_context.h" #include "BKE_screen.h" -#include "ED_space_api.h" #include "ED_anim_api.h" #include "ED_markers.h" #include "ED_screen.h" +#include "ED_space_api.h" #include "ED_time_scrub_ui.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" +#include "WM_types.h" #include "RNA_access.h" @@ -52,8 +52,8 @@ #include "UI_resources.h" #include "UI_view2d.h" -#include "nla_intern.h" /* own include */ #include "GPU_framebuffer.h" +#include "nla_intern.h" /* own include */ /* ******************** default callbacks for nla space ***************** */ diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index beaa8c2617e..55a5a043014 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -28,10 +28,10 @@ #include "DNA_node_types.h" #include "DNA_object_types.h" -#include "DNA_space_types.h" #include "DNA_screen_types.h" -#include "DNA_userdef_types.h" +#include "DNA_space_types.h" #include "DNA_text_types.h" +#include "DNA_userdef_types.h" #include "BKE_context.h" #include "BKE_curve.h" @@ -47,9 +47,9 @@ #include "GPU_batch.h" #include "GPU_batch_presets.h" -#include "GPU_platform.h" #include "GPU_immediate.h" #include "GPU_matrix.h" +#include "GPU_platform.h" #include "GPU_state.h" #include "RNA_access.h" @@ -67,10 +67,10 @@ #include "IMB_colormanagement.h" #include "IMB_imbuf_types.h" -#include "node_intern.h" /* own include */ #include "NOD_composite.h" #include "NOD_shader.h" #include "NOD_texture.h" +#include "node_intern.h" /* own include */ /* ****************** SOCKET BUTTON DRAW FUNCTIONS ***************** */ diff --git a/source/blender/editors/space_node/node_add.c b/source/blender/editors/space_node/node_add.c index 644f2b2dc5b..1d73937d762 100644 --- a/source/blender/editors/space_node/node_add.c +++ b/source/blender/editors/space_node/node_add.c @@ -40,8 +40,8 @@ #include "BKE_texture.h" #include "ED_node.h" /* own include */ -#include "ED_screen.h" #include "ED_render.h" +#include "ED_screen.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/space_node/node_buttons.c b/source/blender/editors/space_node/node_buttons.c index 072a67dee6c..ee1d2b43c5f 100644 --- a/source/blender/editors/space_node/node_buttons.c +++ b/source/blender/editors/space_node/node_buttons.c @@ -25,8 +25,8 @@ #include "DNA_node_types.h" -#include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_math.h" #include "BLT_translation.h" diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c index d2258db074d..0552660b9bf 100644 --- a/source/blender/editors/space_node/node_draw.c +++ b/source/blender/editors/space_node/node_draw.c @@ -23,16 +23,16 @@ */ #include "DNA_light_types.h" -#include "DNA_node_types.h" +#include "DNA_linestyle_types.h" #include "DNA_material_types.h" +#include "DNA_node_types.h" #include "DNA_screen_types.h" #include "DNA_space_types.h" #include "DNA_texture_types.h" #include "DNA_world_types.h" -#include "DNA_linestyle_types.h" -#include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_math.h" #include "BLT_translation.h" @@ -47,17 +47,17 @@ #include "BIF_glutil.h" +#include "GPU_framebuffer.h" #include "GPU_immediate.h" #include "GPU_immediate_util.h" #include "GPU_matrix.h" #include "GPU_state.h" -#include "GPU_framebuffer.h" #include "WM_api.h" #include "WM_types.h" -#include "ED_node.h" #include "ED_gpencil.h" +#include "ED_node.h" #include "ED_space_api.h" #include "UI_resources.h" diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c index 677a7cac745..9d81994bb0b 100644 --- a/source/blender/editors/space_node/node_edit.c +++ b/source/blender/editors/space_node/node_edit.c @@ -29,8 +29,8 @@ #include "DNA_text_types.h" #include "DNA_world_types.h" -#include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_math.h" #include "BKE_context.h" #include "BKE_global.h" @@ -50,9 +50,9 @@ #include "RE_pipeline.h" #include "ED_node.h" /* own include */ -#include "ED_select_utils.h" -#include "ED_screen.h" #include "ED_render.h" +#include "ED_screen.h" +#include "ED_select_utils.h" #include "RNA_access.h" #include "RNA_define.h" @@ -67,10 +67,10 @@ #include "IMB_imbuf_types.h" -#include "node_intern.h" /* own include */ #include "NOD_composite.h" #include "NOD_shader.h" #include "NOD_texture.h" +#include "node_intern.h" /* own include */ #define USE_ESC_COMPO diff --git a/source/blender/editors/space_node/node_gizmo.c b/source/blender/editors/space_node/node_gizmo.c index e20cadf21a3..28d7e1b8d04 100644 --- a/source/blender/editors/space_node/node_gizmo.c +++ b/source/blender/editors/space_node/node_gizmo.c @@ -20,17 +20,17 @@ #include <math.h> -#include "BLI_utildefines.h" #include "BLI_math_matrix.h" #include "BLI_math_vector.h" #include "BLI_rect.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_image.h" #include "BKE_main.h" -#include "ED_screen.h" #include "ED_gizmo_library.h" +#include "ED_screen.h" #include "IMB_imbuf_types.h" diff --git a/source/blender/editors/space_node/node_group.c b/source/blender/editors/space_node/node_group.c index 64e8358c23c..2a4c6147d5d 100644 --- a/source/blender/editors/space_node/node_group.c +++ b/source/blender/editors/space_node/node_group.c @@ -25,11 +25,11 @@ #include "MEM_guardedalloc.h" -#include "DNA_node_types.h" #include "DNA_anim_types.h" +#include "DNA_node_types.h" -#include "BLI_listbase.h" #include "BLI_linklist.h" +#include "BLI_listbase.h" #include "BLI_math.h" #include "BLT_translation.h" @@ -44,8 +44,8 @@ #include "DEG_depsgraph_build.h" #include "ED_node.h" /* own include */ -#include "ED_screen.h" #include "ED_render.h" +#include "ED_screen.h" #include "RNA_access.h" #include "RNA_define.h" @@ -55,8 +55,8 @@ #include "UI_resources.h" -#include "node_intern.h" /* own include */ #include "NOD_common.h" +#include "node_intern.h" /* own include */ static bool node_group_operator_active(bContext *C) { diff --git a/source/blender/editors/space_node/node_intern.h b/source/blender/editors/space_node/node_intern.h index c1aeca87d7b..8c7c490b181 100644 --- a/source/blender/editors/space_node/node_intern.h +++ b/source/blender/editors/space_node/node_intern.h @@ -24,9 +24,9 @@ #ifndef __NODE_INTERN_H__ #define __NODE_INTERN_H__ -#include <stddef.h> /* for size_t */ #include "BKE_node.h" #include "UI_interface.h" +#include <stddef.h> /* for size_t */ /* internal exports only */ diff --git a/source/blender/editors/space_node/node_relationships.c b/source/blender/editors/space_node/node_relationships.c index 7556b6ebd06..5dc98a3905a 100644 --- a/source/blender/editors/space_node/node_relationships.c +++ b/source/blender/editors/space_node/node_relationships.c @@ -26,9 +26,9 @@ #include "DNA_anim_types.h" #include "DNA_node_types.h" -#include "BLI_math.h" #include "BLI_blenlib.h" #include "BLI_easing.h" +#include "BLI_math.h" #include "BKE_animsys.h" #include "BKE_context.h" @@ -37,8 +37,8 @@ #include "BKE_node.h" #include "ED_node.h" /* own include */ -#include "ED_screen.h" #include "ED_render.h" +#include "ED_screen.h" #include "ED_util.h" #include "RNA_access.h" @@ -47,8 +47,8 @@ #include "WM_api.h" #include "WM_types.h" -#include "UI_view2d.h" #include "UI_resources.h" +#include "UI_view2d.h" #include "BLT_translation.h" diff --git a/source/blender/editors/space_node/node_select.c b/source/blender/editors/space_node/node_select.c index a2453cb0837..2c9e7a213c2 100644 --- a/source/blender/editors/space_node/node_select.c +++ b/source/blender/editors/space_node/node_select.c @@ -25,12 +25,12 @@ #include "DNA_node_types.h" -#include "BLI_utildefines.h" -#include "BLI_rect.h" #include "BLI_lasso_2d.h" #include "BLI_math.h" +#include "BLI_rect.h" #include "BLI_string.h" #include "BLI_string_utf8.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_main.h" diff --git a/source/blender/editors/space_node/node_templates.c b/source/blender/editors/space_node/node_templates.c index ccbd09d8b68..7d4095326f8 100644 --- a/source/blender/editors/space_node/node_templates.c +++ b/source/blender/editors/space_node/node_templates.c @@ -41,8 +41,8 @@ #include "NOD_socket.h" -#include "UI_interface.h" #include "../interface/interface_intern.h" /* XXX bad level */ +#include "UI_interface.h" #include "ED_node.h" /* own include */ diff --git a/source/blender/editors/space_node/node_view.c b/source/blender/editors/space_node/node_view.c index 7023a3ebd18..9283b073e86 100644 --- a/source/blender/editors/space_node/node_view.c +++ b/source/blender/editors/space_node/node_view.c @@ -23,9 +23,9 @@ #include "DNA_node_types.h" +#include "BLI_math.h" #include "BLI_rect.h" #include "BLI_utildefines.h" -#include "BLI_math.h" #include "BKE_context.h" #include "BKE_image.h" @@ -33,10 +33,10 @@ #include "BKE_node.h" #include "BKE_screen.h" +#include "ED_image.h" #include "ED_node.h" /* own include */ #include "ED_screen.h" #include "ED_space_api.h" -#include "ED_image.h" #include "RNA_access.h" #include "RNA_define.h" @@ -52,8 +52,8 @@ #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" -#include "node_intern.h" /* own include */ #include "NOD_composite.h" +#include "node_intern.h" /* own include */ /* **************** View All Operator ************** */ diff --git a/source/blender/editors/space_node/space_node.c b/source/blender/editors/space_node/space_node.c index 951c26b69e0..ce351595522 100644 --- a/source/blender/editors/space_node/space_node.c +++ b/source/blender/editors/space_node/space_node.c @@ -34,14 +34,14 @@ #include "BKE_context.h" #include "BKE_lib_id.h" +#include "BKE_node.h" #include "BKE_scene.h" #include "BKE_screen.h" -#include "BKE_node.h" -#include "ED_space_api.h" #include "ED_node.h" #include "ED_render.h" #include "ED_screen.h" +#include "ED_space_api.h" #include "UI_resources.h" #include "UI_view2d.h" diff --git a/source/blender/editors/space_outliner/outliner_collections.c b/source/blender/editors/space_outliner/outliner_collections.c index f129bc9e2ea..8da085f436d 100644 --- a/source/blender/editors/space_outliner/outliner_collections.c +++ b/source/blender/editors/space_outliner/outliner_collections.c @@ -20,14 +20,14 @@ #include <string.h> -#include "BLI_utildefines.h" #include "BLI_listbase.h" +#include "BLI_utildefines.h" #include "DNA_collection_types.h" #include "DNA_object_types.h" -#include "BKE_context.h" #include "BKE_collection.h" +#include "BKE_context.h" #include "BKE_layer.h" #include "BKE_lib_id.h" #include "BKE_main.h" @@ -41,8 +41,8 @@ #include "ED_screen.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" +#include "WM_types.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index 83ddbe63e9c..dcef1c9db6a 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -24,21 +24,21 @@ #include "DNA_anim_types.h" #include "DNA_armature_types.h" #include "DNA_collection_types.h" -#include "DNA_gpencil_types.h" +#include "DNA_constraint_types.h" #include "DNA_gpencil_modifier_types.h" +#include "DNA_gpencil_types.h" #include "DNA_light_types.h" #include "DNA_lightprobe_types.h" +#include "DNA_object_force_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_sequence_types.h" -#include "DNA_constraint_types.h" -#include "DNA_object_force_types.h" -#include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_math.h" +#include "BLI_mempool.h" #include "BLI_string_utils.h" #include "BLI_utildefines.h" -#include "BLI_mempool.h" #include "BLT_translation.h" diff --git a/source/blender/editors/space_outliner/outliner_edit.c b/source/blender/editors/space_outliner/outliner_edit.c index 1d852d72e6e..f2a3bad03b4 100644 --- a/source/blender/editors/space_outliner/outliner_edit.c +++ b/source/blender/editors/space_outliner/outliner_edit.c @@ -25,17 +25,17 @@ #include "MEM_guardedalloc.h" +#include "DNA_ID.h" #include "DNA_anim_types.h" #include "DNA_collection_types.h" -#include "DNA_ID.h" -#include "DNA_scene_types.h" -#include "DNA_object_types.h" #include "DNA_material_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BLI_blenlib.h" #include "BLI_dynstr.h" -#include "BLI_utildefines.h" #include "BLI_path_util.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" @@ -60,12 +60,12 @@ #include "../blenloader/BLO_readfile.h" +#include "ED_armature.h" +#include "ED_keyframing.h" #include "ED_object.h" #include "ED_outliner.h" #include "ED_screen.h" #include "ED_select_utils.h" -#include "ED_keyframing.h" -#include "ED_armature.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c index 8ddacfc84c2..d50a097e6f6 100644 --- a/source/blender/editors/space_outliner/outliner_select.c +++ b/source/blender/editors/space_outliner/outliner_select.c @@ -27,16 +27,16 @@ #include "DNA_armature_types.h" #include "DNA_collection_types.h" +#include "DNA_gpencil_types.h" #include "DNA_light_types.h" #include "DNA_material_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_sequence_types.h" #include "DNA_world_types.h" -#include "DNA_gpencil_types.h" -#include "BLI_utildefines.h" #include "BLI_listbase.h" +#include "BLI_utildefines.h" #include "BKE_armature.h" #include "BKE_collection.h" diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c index 5bb0d626c2f..768ec17c1e7 100644 --- a/source/blender/editors/space_outliner/outliner_tools.c +++ b/source/blender/editors/space_outliner/outliner_tools.c @@ -26,6 +26,7 @@ #include "DNA_anim_types.h" #include "DNA_armature_types.h" #include "DNA_collection_types.h" +#include "DNA_constraint_types.h" #include "DNA_gpencil_types.h" #include "DNA_hair_types.h" #include "DNA_light_types.h" @@ -33,23 +34,21 @@ #include "DNA_material_types.h" #include "DNA_mesh_types.h" #include "DNA_meta_types.h" +#include "DNA_modifier_types.h" +#include "DNA_object_types.h" #include "DNA_pointcloud_types.h" #include "DNA_scene_types.h" #include "DNA_sequence_types.h" #include "DNA_volume_types.h" #include "DNA_world_types.h" -#include "DNA_object_types.h" -#include "DNA_constraint_types.h" -#include "DNA_modifier_types.h" #include "BLI_blenlib.h" #include "BLI_utildefines.h" #include "BKE_animsys.h" #include "BKE_collection.h" -#include "BKE_context.h" #include "BKE_constraint.h" -#include "BKE_object.h" +#include "BKE_context.h" #include "BKE_fcurve.h" #include "BKE_global.h" #include "BKE_layer.h" @@ -57,6 +56,7 @@ #include "BKE_lib_override.h" #include "BKE_lib_query.h" #include "BKE_main.h" +#include "BKE_object.h" #include "BKE_report.h" #include "BKE_scene.h" #include "BKE_screen.h" @@ -74,12 +74,12 @@ #include "ED_undo.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" +#include "WM_types.h" #include "UI_interface.h" -#include "UI_view2d.h" #include "UI_resources.h" +#include "UI_view2d.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c index b942021ca33..2787ab5cc52 100644 --- a/source/blender/editors/space_outliner/outliner_tree.c +++ b/source/blender/editors/space_outliner/outliner_tree.c @@ -28,33 +28,33 @@ #include "DNA_anim_types.h" #include "DNA_armature_types.h" -#include "DNA_constraint_types.h" -#include "DNA_camera_types.h" #include "DNA_cachefile_types.h" +#include "DNA_camera_types.h" #include "DNA_collection_types.h" +#include "DNA_constraint_types.h" #include "DNA_gpencil_types.h" #include "DNA_hair_types.h" #include "DNA_key_types.h" #include "DNA_light_types.h" +#include "DNA_lightprobe_types.h" +#include "DNA_linestyle_types.h" #include "DNA_material_types.h" #include "DNA_mesh_types.h" #include "DNA_meta_types.h" -#include "DNA_lightprobe_types.h" +#include "DNA_object_types.h" #include "DNA_particle_types.h" #include "DNA_pointcloud_types.h" #include "DNA_scene_types.h" -#include "DNA_volume_types.h" -#include "DNA_world_types.h" #include "DNA_sequence_types.h" #include "DNA_speaker_types.h" -#include "DNA_object_types.h" -#include "DNA_linestyle_types.h" +#include "DNA_volume_types.h" +#include "DNA_world_types.h" #include "BLI_blenlib.h" +#include "BLI_fnmatch.h" #include "BLI_listbase.h" -#include "BLI_utildefines.h" #include "BLI_mempool.h" -#include "BLI_fnmatch.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" diff --git a/source/blender/editors/space_outliner/outliner_utils.c b/source/blender/editors/space_outliner/outliner_utils.c index 61ba4e9551d..45b46788c8f 100644 --- a/source/blender/editors/space_outliner/outliner_utils.c +++ b/source/blender/editors/space_outliner/outliner_utils.c @@ -30,9 +30,9 @@ #include "DNA_space_types.h" #include "BKE_context.h" -#include "BKE_outliner_treehash.h" #include "BKE_layer.h" #include "BKE_object.h" +#include "BKE_outliner_treehash.h" #include "ED_armature.h" #include "ED_outliner.h" diff --git a/source/blender/editors/space_outliner/space_outliner.c b/source/blender/editors/space_outliner/space_outliner.c index ff9b3c8a05b..cfeaf8aa897 100644 --- a/source/blender/editors/space_outliner/space_outliner.c +++ b/source/blender/editors/space_outliner/space_outliner.c @@ -21,23 +21,23 @@ * \ingroup spoutliner */ -#include <string.h> #include <stdio.h> +#include <string.h> #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_mempool.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_layer.h" -#include "BKE_screen.h" -#include "BKE_scene.h" #include "BKE_outliner_treehash.h" +#include "BKE_scene.h" +#include "BKE_screen.h" -#include "ED_space_api.h" #include "ED_screen.h" +#include "ED_space_api.h" #include "WM_api.h" #include "WM_message.h" @@ -45,14 +45,14 @@ #include "RNA_access.h" -#include "DNA_scene_types.h" #include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "UI_resources.h" #include "UI_view2d.h" -#include "outliner_intern.h" #include "GPU_framebuffer.h" +#include "outliner_intern.h" static void outliner_main_region_init(wmWindowManager *wm, ARegion *region) { diff --git a/source/blender/editors/space_script/script_edit.c b/source/blender/editors/space_script/script_edit.c index d2f2411c538..79311cac6b5 100644 --- a/source/blender/editors/space_script/script_edit.c +++ b/source/blender/editors/space_script/script_edit.c @@ -21,11 +21,11 @@ * \ingroup spscript */ -#include <string.h> #include <stdio.h> +#include <string.h> -#include "BLI_utildefines.h" #include "BLI_listbase.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_report.h" diff --git a/source/blender/editors/space_script/script_ops.c b/source/blender/editors/space_script/script_ops.c index 3101bf6a7a7..4b557daf36a 100644 --- a/source/blender/editors/space_script/script_ops.c +++ b/source/blender/editors/space_script/script_ops.c @@ -21,8 +21,8 @@ * \ingroup spscript */ -#include <stdlib.h> #include <math.h> +#include <stdlib.h> #include "WM_api.h" diff --git a/source/blender/editors/space_script/space_script.c b/source/blender/editors/space_script/space_script.c index 4ee3a87e4fa..d872facd488 100644 --- a/source/blender/editors/space_script/space_script.c +++ b/source/blender/editors/space_script/space_script.c @@ -21,8 +21,8 @@ * \ingroup spscript */ -#include <string.h> #include <stdio.h> +#include <string.h> #include "MEM_guardedalloc.h" @@ -32,8 +32,8 @@ #include "BKE_context.h" #include "BKE_screen.h" -#include "ED_space_api.h" #include "ED_screen.h" +#include "ED_space_api.h" #include "WM_api.h" #include "WM_types.h" @@ -44,8 +44,8 @@ #ifdef WITH_PYTHON #endif -#include "script_intern.h" // own include #include "GPU_framebuffer.h" +#include "script_intern.h" // own include // static script_run_python(char *funcname, ) diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c index d3179095e24..ac9b605b193 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.c +++ b/source/blender/editors/space_sequencer/sequencer_add.c @@ -21,10 +21,10 @@ * \ingroup spseq */ -#include <stdlib.h> +#include <ctype.h> #include <math.h> +#include <stdlib.h> #include <string.h> -#include <ctype.h> #include "MEM_guardedalloc.h" @@ -34,8 +34,8 @@ #include "BLT_translation.h" -#include "DNA_scene_types.h" #include "DNA_mask_types.h" +#include "DNA_scene_types.h" #include "BKE_context.h" #include "BKE_lib_id.h" diff --git a/source/blender/editors/space_sequencer/sequencer_buttons.c b/source/blender/editors/space_sequencer/sequencer_buttons.c index 7bec913900d..a2568e2e827 100644 --- a/source/blender/editors/space_sequencer/sequencer_buttons.c +++ b/source/blender/editors/space_sequencer/sequencer_buttons.c @@ -21,13 +21,13 @@ * \ingroup spseq */ -#include <string.h> #include <stdio.h> +#include <string.h> #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_listbase.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" @@ -35,15 +35,15 @@ #include "BKE_global.h" #include "BKE_screen.h" -#include "ED_screen.h" #include "ED_gpencil.h" +#include "ED_screen.h" #include "ED_sequencer.h" #include "WM_api.h" #include "WM_types.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "sequencer_intern.h" diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c index fa1e26881c8..058d41ab294 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_draw.c @@ -21,50 +21,50 @@ * \ingroup spseq */ -#include <string.h> #include <math.h> +#include <string.h> #include "BLI_blenlib.h" #include "BLI_math.h" -#include "BLI_utildefines.h" #include "BLI_threads.h" +#include "BLI_utildefines.h" #include "IMB_imbuf_types.h" -#include "DNA_scene_types.h" +#include "DNA_anim_types.h" #include "DNA_mask_types.h" #include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "DNA_screen_types.h" +#include "DNA_sound_types.h" #include "DNA_space_types.h" #include "DNA_userdef_types.h" -#include "DNA_sound_types.h" -#include "DNA_anim_types.h" #include "BKE_context.h" +#include "BKE_fcurve.h" #include "BKE_global.h" +#include "BKE_scene.h" #include "BKE_sequencer.h" #include "BKE_sound.h" -#include "BKE_scene.h" -#include "BKE_fcurve.h" #include "IMB_colormanagement.h" #include "IMB_imbuf.h" +#include "GPU_framebuffer.h" #include "GPU_immediate.h" #include "GPU_immediate_util.h" #include "GPU_matrix.h" #include "GPU_state.h" -#include "GPU_framebuffer.h" #include "GPU_vertex_buffer.h" #include "ED_anim_api.h" #include "ED_gpencil.h" #include "ED_markers.h" #include "ED_mask.h" -#include "ED_sequencer.h" #include "ED_screen.h" -#include "ED_time_scrub_ui.h" +#include "ED_sequencer.h" #include "ED_space_api.h" +#include "ED_time_scrub_ui.h" #include "BIF_glutil.h" diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index 769c74bb82c..3f36c844f30 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -21,8 +21,8 @@ * \ingroup spseq */ -#include <stdlib.h> #include <math.h> +#include <stdlib.h> #include <string.h> #include "MEM_guardedalloc.h" @@ -40,11 +40,11 @@ #include "BKE_context.h" #include "BKE_global.h" +#include "BKE_lib_id.h" #include "BKE_main.h" #include "BKE_report.h" #include "BKE_sequencer.h" #include "BKE_sound.h" -#include "BKE_lib_id.h" #include "WM_api.h" #include "WM_types.h" @@ -57,12 +57,12 @@ #include "ED_anim_api.h" #include "ED_numinput.h" #include "ED_screen.h" -#include "ED_transform.h" #include "ED_sequencer.h" #include "ED_space_api.h" +#include "ED_transform.h" -#include "UI_view2d.h" #include "UI_interface.h" +#include "UI_view2d.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" diff --git a/source/blender/editors/space_sequencer/sequencer_intern.h b/source/blender/editors/space_sequencer/sequencer_intern.h index 2cbd4d35e27..fe3170e10e0 100644 --- a/source/blender/editors/space_sequencer/sequencer_intern.h +++ b/source/blender/editors/space_sequencer/sequencer_intern.h @@ -24,8 +24,8 @@ #ifndef __SEQUENCER_INTERN_H__ #define __SEQUENCER_INTERN_H__ -#include "RNA_access.h" #include "DNA_sequence_types.h" +#include "RNA_access.h" /* internal exports only */ diff --git a/source/blender/editors/space_sequencer/sequencer_ops.c b/source/blender/editors/space_sequencer/sequencer_ops.c index 5f7a66fd439..4296701366a 100644 --- a/source/blender/editors/space_sequencer/sequencer_ops.c +++ b/source/blender/editors/space_sequencer/sequencer_ops.c @@ -21,18 +21,18 @@ * \ingroup spseq */ -#include <stdlib.h> #include <math.h> +#include <stdlib.h> #include "DNA_space_types.h" #include "WM_api.h" #include "WM_types.h" -#include "ED_sequencer.h" #include "ED_markers.h" -#include "ED_transform.h" /* transform keymap */ #include "ED_select_utils.h" +#include "ED_sequencer.h" +#include "ED_transform.h" /* transform keymap */ #include "BKE_sequencer.h" diff --git a/source/blender/editors/space_sequencer/sequencer_preview.c b/source/blender/editors/space_sequencer/sequencer_preview.c index 8ec3ed850d2..7c8a5ff5981 100644 --- a/source/blender/editors/space_sequencer/sequencer_preview.c +++ b/source/blender/editors/space_sequencer/sequencer_preview.c @@ -27,9 +27,9 @@ #include "BLI_listbase.h" #include "BLI_threads.h" -#include "BKE_sound.h" #include "BKE_context.h" #include "BKE_global.h" +#include "BKE_sound.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/space_sequencer/sequencer_scopes.c b/source/blender/editors/space_sequencer/sequencer_scopes.c index 4d492d74e82..309840ea9e3 100644 --- a/source/blender/editors/space_sequencer/sequencer_scopes.c +++ b/source/blender/editors/space_sequencer/sequencer_scopes.c @@ -23,12 +23,12 @@ #include <math.h> #include <string.h> -#include "BLI_utildefines.h" #include "BLI_task.h" +#include "BLI_utildefines.h" #include "IMB_colormanagement.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "atomic_ops.h" diff --git a/source/blender/editors/space_sequencer/sequencer_select.c b/source/blender/editors/space_sequencer/sequencer_select.c index 7f243b8a6ad..ccb18331c55 100644 --- a/source/blender/editors/space_sequencer/sequencer_select.c +++ b/source/blender/editors/space_sequencer/sequencer_select.c @@ -21,13 +21,13 @@ * \ingroup spseq */ -#include <stdlib.h> #include <math.h> +#include <stdlib.h> #include <string.h> #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "DNA_scene_types.h" @@ -44,8 +44,8 @@ #include "ED_outliner.h" #include "ED_screen.h" -#include "ED_sequencer.h" #include "ED_select_utils.h" +#include "ED_sequencer.h" #include "UI_view2d.h" diff --git a/source/blender/editors/space_sequencer/sequencer_view.c b/source/blender/editors/space_sequencer/sequencer_view.c index f30a604ca93..714a634766c 100644 --- a/source/blender/editors/space_sequencer/sequencer_view.c +++ b/source/blender/editors/space_sequencer/sequencer_view.c @@ -30,8 +30,8 @@ #include "BKE_context.h" #include "BKE_main.h" -#include "BKE_sequencer.h" #include "BKE_screen.h" +#include "BKE_sequencer.h" #include "WM_api.h" #include "WM_types.h" @@ -40,9 +40,9 @@ #include "ED_screen.h" #include "ED_space_api.h" +#include "IMB_colormanagement.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" -#include "IMB_colormanagement.h" #include "UI_view2d.h" diff --git a/source/blender/editors/space_sequencer/space_sequencer.c b/source/blender/editors/space_sequencer/space_sequencer.c index 8a934a28690..1aa2a0c9c44 100644 --- a/source/blender/editors/space_sequencer/space_sequencer.c +++ b/source/blender/editors/space_sequencer/space_sequencer.c @@ -21,12 +21,12 @@ * \ingroup spseq */ -#include <string.h> #include <stdio.h> +#include <string.h> #include "DNA_gpencil_types.h" -#include "DNA_scene_types.h" #include "DNA_mask_types.h" +#include "DNA_scene_types.h" #include "MEM_guardedalloc.h" @@ -40,14 +40,14 @@ #include "BKE_sequencer.h" #include "BKE_sequencer_offscreen.h" -#include "ED_space_api.h" #include "ED_screen.h" +#include "ED_space_api.h" #include "ED_view3d.h" #include "ED_view3d_offscreen.h" /* only for sequencer view3d drawing callback */ #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" +#include "WM_types.h" #include "RNA_access.h" diff --git a/source/blender/editors/space_statusbar/space_statusbar.c b/source/blender/editors/space_statusbar/space_statusbar.c index a37ad59fc14..1efb18403de 100644 --- a/source/blender/editors/space_statusbar/space_statusbar.c +++ b/source/blender/editors/space_statusbar/space_statusbar.c @@ -18,8 +18,8 @@ * \ingroup spstatusbar */ -#include <string.h> #include <stdio.h> +#include <string.h> #include "MEM_guardedalloc.h" @@ -37,8 +37,8 @@ #include "UI_view2d.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" +#include "WM_types.h" /* ******************** default callbacks for statusbar space ******************** */ diff --git a/source/blender/editors/space_text/space_text.c b/source/blender/editors/space_text/space_text.c index 437b118a69c..92b084a8d0d 100644 --- a/source/blender/editors/space_text/space_text.c +++ b/source/blender/editors/space_text/space_text.c @@ -29,14 +29,14 @@ #include "BLI_blenlib.h" -#include "BKE_global.h" #include "BKE_context.h" +#include "BKE_global.h" #include "BKE_lib_id.h" #include "BKE_screen.h" #include "BKE_text.h" -#include "ED_space_api.h" #include "ED_screen.h" +#include "ED_space_api.h" #include "WM_api.h" #include "WM_types.h" @@ -47,9 +47,9 @@ #include "RNA_access.h" +#include "GPU_framebuffer.h" #include "text_format.h" #include "text_intern.h" /* own include */ -#include "GPU_framebuffer.h" /* ******************** default callbacks for text space ***************** */ diff --git a/source/blender/editors/space_text/text_autocomplete.c b/source/blender/editors/space_text/text_autocomplete.c index 7a74cf9fe80..cb1861d8726 100644 --- a/source/blender/editors/space_text/text_autocomplete.c +++ b/source/blender/editors/space_text/text_autocomplete.c @@ -29,16 +29,16 @@ #include "BLI_ghash.h" #include "BKE_context.h" +#include "BKE_screen.h" #include "BKE_text.h" #include "BKE_text_suggestions.h" -#include "BKE_screen.h" #include "WM_api.h" #include "WM_types.h" +#include "ED_screen.h" #include "ED_text.h" #include "ED_undo.h" -#include "ED_screen.h" #include "UI_interface.h" diff --git a/source/blender/editors/space_text/text_draw.c b/source/blender/editors/space_text/text_draw.c index b03c3ca68cb..777b6b1ef1d 100644 --- a/source/blender/editors/space_text/text_draw.c +++ b/source/blender/editors/space_text/text_draw.c @@ -27,14 +27,14 @@ #include "BLI_blenlib.h" #include "BLI_math.h" -#include "DNA_text_types.h" -#include "DNA_space_types.h" #include "DNA_screen_types.h" +#include "DNA_space_types.h" +#include "DNA_text_types.h" #include "BKE_context.h" +#include "BKE_screen.h" #include "BKE_text.h" #include "BKE_text_suggestions.h" -#include "BKE_screen.h" #include "ED_text.h" @@ -45,8 +45,8 @@ #include "UI_resources.h" #include "UI_view2d.h" -#include "text_intern.h" #include "text_format.h" +#include "text_intern.h" /******************** text font drawing ******************/ diff --git a/source/blender/editors/space_text/text_format.c b/source/blender/editors/space_text/text_format.c index 48ee30e450f..2eeb46049d2 100644 --- a/source/blender/editors/space_text/text_format.c +++ b/source/blender/editors/space_text/text_format.c @@ -27,8 +27,8 @@ #include "BLI_blenlib.h" #include "BLI_string_utils.h" -#include "DNA_text_types.h" #include "DNA_space_types.h" +#include "DNA_text_types.h" #include "ED_text.h" diff --git a/source/blender/editors/space_text/text_format_lua.c b/source/blender/editors/space_text/text_format_lua.c index 6bbb0d529ab..42a52ce0f58 100644 --- a/source/blender/editors/space_text/text_format_lua.c +++ b/source/blender/editors/space_text/text_format_lua.c @@ -21,8 +21,8 @@ #include "BLI_blenlib.h" -#include "DNA_text_types.h" #include "DNA_space_types.h" +#include "DNA_text_types.h" #include "BKE_text.h" diff --git a/source/blender/editors/space_text/text_format_osl.c b/source/blender/editors/space_text/text_format_osl.c index 0275a293e7a..53e38cfe870 100644 --- a/source/blender/editors/space_text/text_format_osl.c +++ b/source/blender/editors/space_text/text_format_osl.c @@ -21,8 +21,8 @@ #include "BLI_blenlib.h" -#include "DNA_text_types.h" #include "DNA_space_types.h" +#include "DNA_text_types.h" #include "BKE_text.h" diff --git a/source/blender/editors/space_text/text_format_pov.c b/source/blender/editors/space_text/text_format_pov.c index 13830aa7c4d..52aaad034bf 100644 --- a/source/blender/editors/space_text/text_format_pov.c +++ b/source/blender/editors/space_text/text_format_pov.c @@ -21,8 +21,8 @@ #include "BLI_blenlib.h" -#include "DNA_text_types.h" #include "DNA_space_types.h" +#include "DNA_text_types.h" #include "BKE_text.h" diff --git a/source/blender/editors/space_text/text_format_pov_ini.c b/source/blender/editors/space_text/text_format_pov_ini.c index 08f6d10ac6d..df4f1e6b38c 100644 --- a/source/blender/editors/space_text/text_format_pov_ini.c +++ b/source/blender/editors/space_text/text_format_pov_ini.c @@ -21,8 +21,8 @@ #include "BLI_blenlib.h" -#include "DNA_text_types.h" #include "DNA_space_types.h" +#include "DNA_text_types.h" #include "BKE_text.h" diff --git a/source/blender/editors/space_text/text_format_py.c b/source/blender/editors/space_text/text_format_py.c index 1e628bbc39b..3858f7225ef 100644 --- a/source/blender/editors/space_text/text_format_py.c +++ b/source/blender/editors/space_text/text_format_py.c @@ -21,8 +21,8 @@ #include "BLI_blenlib.h" -#include "DNA_text_types.h" #include "DNA_space_types.h" +#include "DNA_text_types.h" #include "BKE_text.h" diff --git a/source/blender/editors/space_text/text_ops.c b/source/blender/editors/space_text/text_ops.c index 43010829bdf..e0b15d0a9d5 100644 --- a/source/blender/editors/space_text/text_ops.c +++ b/source/blender/editors/space_text/text_ops.c @@ -21,8 +21,8 @@ * \ingroup sptext */ -#include <string.h> #include <errno.h> +#include <string.h> #include "MEM_guardedalloc.h" @@ -44,9 +44,9 @@ #include "WM_api.h" #include "WM_types.h" -#include "ED_text.h" #include "ED_curve.h" #include "ED_screen.h" +#include "ED_text.h" #include "UI_interface.h" #include "UI_resources.h" @@ -57,8 +57,8 @@ # include "BPY_extern.h" #endif -#include "text_intern.h" #include "text_format.h" +#include "text_intern.h" static void txt_screen_clamp(SpaceText *st, ARegion *region); diff --git a/source/blender/editors/space_text/text_undo.c b/source/blender/editors/space_text/text_undo.c index 4a628cf70e4..4126f36e44a 100644 --- a/source/blender/editors/space_text/text_undo.c +++ b/source/blender/editors/space_text/text_undo.c @@ -18,8 +18,8 @@ * \ingroup sptext */ -#include <string.h> #include <errno.h> +#include <string.h> #include "MEM_guardedalloc.h" @@ -33,17 +33,17 @@ #include "PIL_time.h" #include "BKE_context.h" +#include "BKE_main.h" #include "BKE_report.h" #include "BKE_text.h" #include "BKE_undo_system.h" -#include "BKE_main.h" #include "WM_api.h" #include "WM_types.h" -#include "ED_text.h" #include "ED_curve.h" #include "ED_screen.h" +#include "ED_text.h" #include "ED_undo.h" #include "UI_interface.h" @@ -52,8 +52,8 @@ #include "RNA_access.h" #include "RNA_define.h" -#include "text_intern.h" #include "text_format.h" +#include "text_intern.h" /* -------------------------------------------------------------------- */ /** \name Implements ED Undo System diff --git a/source/blender/editors/space_topbar/space_topbar.c b/source/blender/editors/space_topbar/space_topbar.c index facdba46b21..cacf956aa84 100644 --- a/source/blender/editors/space_topbar/space_topbar.c +++ b/source/blender/editors/space_topbar/space_topbar.c @@ -21,8 +21,8 @@ * \ingroup sptopbar */ -#include <string.h> #include <stdio.h> +#include <string.h> #include "MEM_guardedalloc.h" @@ -47,8 +47,8 @@ #include "RNA_access.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" +#include "WM_types.h" /* ******************** default callbacks for topbar space ***************** */ diff --git a/source/blender/editors/space_userpref/space_userpref.c b/source/blender/editors/space_userpref/space_userpref.c index e3c1170ddba..d3bea4598ff 100644 --- a/source/blender/editors/space_userpref/space_userpref.c +++ b/source/blender/editors/space_userpref/space_userpref.c @@ -21,8 +21,8 @@ * \ingroup spuserpref */ -#include <string.h> #include <stdio.h> +#include <string.h> #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 00f61a4d0aa..5959052b0ab 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -22,8 +22,8 @@ */ #include "DNA_mesh_types.h" -#include "DNA_scene_types.h" #include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BLI_math.h" @@ -35,9 +35,9 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" -#include "GPU_shader.h" -#include "GPU_immediate.h" #include "GPU_batch.h" +#include "GPU_immediate.h" +#include "GPU_shader.h" #include "GPU_state.h" #include "ED_mesh.h" diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c index 0f5607bc8cd..eb245ae0766 100644 --- a/source/blender/editors/space_view3d/space_view3d.c +++ b/source/blender/editors/space_view3d/space_view3d.c @@ -21,15 +21,15 @@ * \ingroup spview3d */ -#include <string.h> #include <stdio.h> +#include <string.h> +#include "DNA_defaults.h" +#include "DNA_gpencil_types.h" #include "DNA_lightprobe_types.h" #include "DNA_material_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_gpencil_types.h" -#include "DNA_defaults.h" #include "MEM_guardedalloc.h" @@ -51,8 +51,8 @@ #include "BKE_screen.h" #include "BKE_workspace.h" -#include "ED_space_api.h" #include "ED_screen.h" +#include "ED_space_api.h" #include "ED_transform.h" #include "GPU_matrix.h" @@ -60,9 +60,9 @@ #include "DRW_engine.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" #include "WM_toolsystem.h" +#include "WM_types.h" #include "RE_engine.h" #include "RE_pipeline.h" diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c index 54f00b67898..80ab18cd3db 100644 --- a/source/blender/editors/space_view3d/view3d_buttons.c +++ b/source/blender/editors/space_view3d/view3d_buttons.c @@ -21,17 +21,17 @@ * \ingroup spview3d */ -#include <string.h> -#include <stdio.h> -#include <math.h> #include <float.h> +#include <math.h> +#include <stdio.h> +#include <string.h> #include "DNA_armature_types.h" #include "DNA_curve_types.h" #include "DNA_lattice_types.h" -#include "DNA_meta_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" +#include "DNA_meta_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" @@ -39,20 +39,20 @@ #include "BLT_translation.h" -#include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_math.h" #include "BLI_utildefines.h" #include "BKE_action.h" #include "BKE_context.h" #include "BKE_curve.h" #include "BKE_customdata.h" -#include "BKE_screen.h" -#include "BKE_editmesh.h" #include "BKE_deform.h" +#include "BKE_editmesh.h" #include "BKE_object.h" #include "BKE_object_deform.h" #include "BKE_report.h" +#include "BKE_screen.h" #include "DEG_depsgraph.h" @@ -62,8 +62,8 @@ #include "RNA_access.h" #include "ED_armature.h" -#include "ED_object.h" #include "ED_mesh.h" +#include "ED_object.h" #include "ED_screen.h" #include "UI_interface.h" diff --git a/source/blender/editors/space_view3d/view3d_camera_control.c b/source/blender/editors/space_view3d/view3d_camera_control.c index d812ed530ce..a6c1d1bbc33 100644 --- a/source/blender/editors/space_view3d/view3d_camera_control.c +++ b/source/blender/editors/space_view3d/view3d_camera_control.c @@ -37,9 +37,9 @@ * - updating can optionally keyframe the camera object. */ -#include "DNA_scene_types.h" -#include "DNA_object_types.h" #include "DNA_camera_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index 75865bc50e1..8af651c7309 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -23,25 +23,25 @@ #include <math.h> +#include "BLI_jitter_2d.h" #include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_rect.h" #include "BLI_string.h" #include "BLI_string_utils.h" #include "BLI_threads.h" -#include "BLI_jitter_2d.h" #include "BKE_camera.h" #include "BKE_collection.h" #include "BKE_context.h" #include "BKE_customdata.h" #include "BKE_global.h" -#include "BKE_layer.h" #include "BKE_key.h" +#include "BKE_layer.h" #include "BKE_main.h" -#include "BKE_scene.h" #include "BKE_object.h" #include "BKE_paint.h" +#include "BKE_scene.h" #include "BKE_studiolight.h" #include "BKE_unit.h" @@ -62,8 +62,8 @@ #include "DRW_select_buffer.h" #include "ED_armature.h" -#include "ED_keyframing.h" #include "ED_gpencil.h" +#include "ED_keyframing.h" #include "ED_screen.h" #include "ED_screen_types.h" #include "ED_transform.h" @@ -74,13 +74,13 @@ #include "GPU_batch.h" #include "GPU_batch_presets.h" #include "GPU_draw.h" -#include "GPU_matrix.h" +#include "GPU_framebuffer.h" #include "GPU_immediate.h" #include "GPU_immediate_util.h" #include "GPU_material.h" -#include "GPU_viewport.h" +#include "GPU_matrix.h" #include "GPU_state.h" -#include "GPU_framebuffer.h" +#include "GPU_viewport.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index 9ae9811c626..92adc7d6756 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -23,17 +23,17 @@ * 3D view manipulation/operators. */ -#include <string.h> -#include <stdio.h> -#include <math.h> #include <float.h> +#include <math.h> +#include <stdio.h> +#include <string.h> #include "DNA_armature_types.h" #include "DNA_camera_types.h" #include "DNA_curve_types.h" +#include "DNA_gpencil_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_gpencil_types.h" #include "MEM_guardedalloc.h" @@ -60,19 +60,19 @@ #include "DEG_depsgraph_query.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" +#include "WM_types.h" #include "RNA_access.h" #include "RNA_define.h" #include "ED_armature.h" +#include "ED_mesh.h" #include "ED_particle.h" #include "ED_screen.h" #include "ED_transform.h" -#include "ED_mesh.h" -#include "ED_view3d.h" #include "ED_transform_snap_object_context.h" +#include "ED_view3d.h" #include "UI_resources.h" diff --git a/source/blender/editors/space_view3d/view3d_fly.c b/source/blender/editors/space_view3d/view3d_fly.c index b32bcbde3e9..8291d93ee13 100644 --- a/source/blender/editors/space_view3d/view3d_fly.c +++ b/source/blender/editors/space_view3d/view3d_fly.c @@ -30,8 +30,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_math.h" #include "BKE_context.h" #include "BKE_report.h" diff --git a/source/blender/editors/space_view3d/view3d_gizmo_armature.c b/source/blender/editors/space_view3d/view3d_gizmo_armature.c index dbad06da5ec..ee512a5f726 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_armature.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_armature.c @@ -22,18 +22,18 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#include "BKE_armature.h" #include "BKE_action.h" +#include "BKE_armature.h" #include "BKE_context.h" #include "BKE_layer.h" #include "BKE_object.h" -#include "DNA_object_types.h" #include "DNA_armature_types.h" +#include "DNA_object_types.h" #include "ED_armature.h" -#include "ED_screen.h" #include "ED_gizmo_library.h" +#include "ED_screen.h" #include "UI_resources.h" diff --git a/source/blender/editors/space_view3d/view3d_gizmo_camera.c b/source/blender/editors/space_view3d/view3d_gizmo_camera.c index 23845a64ad8..a9928fa2dc0 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_camera.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_camera.c @@ -26,12 +26,12 @@ #include "BKE_context.h" #include "BKE_layer.h" -#include "DNA_object_types.h" #include "DNA_camera_types.h" +#include "DNA_object_types.h" #include "ED_armature.h" -#include "ED_screen.h" #include "ED_gizmo_library.h" +#include "ED_screen.h" #include "UI_resources.h" @@ -40,8 +40,8 @@ #include "RNA_access.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" +#include "WM_types.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/space_view3d/view3d_gizmo_empty.c b/source/blender/editors/space_view3d/view3d_gizmo_empty.c index 793aec42dcd..7f677d88921 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_empty.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_empty.c @@ -22,17 +22,17 @@ #include "BLI_utildefines.h" #include "BKE_context.h" +#include "BKE_image.h" #include "BKE_layer.h" #include "BKE_object.h" -#include "BKE_image.h" #include "DEG_depsgraph.h" -#include "DNA_object_types.h" #include "DNA_light_types.h" +#include "DNA_object_types.h" -#include "ED_screen.h" #include "ED_gizmo_library.h" +#include "ED_screen.h" #include "UI_resources.h" diff --git a/source/blender/editors/space_view3d/view3d_gizmo_forcefield.c b/source/blender/editors/space_view3d/view3d_gizmo_forcefield.c index 90b1539c8a7..242a0a802a6 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_forcefield.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_forcefield.c @@ -24,11 +24,11 @@ #include "BKE_layer.h" #include "BKE_object.h" -#include "DNA_object_types.h" #include "DNA_object_force_types.h" +#include "DNA_object_types.h" -#include "ED_screen.h" #include "ED_gizmo_library.h" +#include "ED_screen.h" #include "UI_resources.h" diff --git a/source/blender/editors/space_view3d/view3d_gizmo_light.c b/source/blender/editors/space_view3d/view3d_gizmo_light.c index 890de0ae611..5bf105b6775 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_light.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_light.c @@ -27,11 +27,11 @@ #include "DEG_depsgraph.h" -#include "DNA_object_types.h" #include "DNA_light_types.h" +#include "DNA_object_types.h" -#include "ED_screen.h" #include "ED_gizmo_library.h" +#include "ED_screen.h" #include "UI_resources.h" diff --git a/source/blender/editors/space_view3d/view3d_gizmo_navigate.c b/source/blender/editors/space_view3d/view3d_gizmo_navigate.c index 91a2ee297ad..cc00037b1fb 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_navigate.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_navigate.c @@ -26,8 +26,8 @@ #include "DNA_object_types.h" -#include "ED_screen.h" #include "ED_gizmo_library.h" +#include "ED_screen.h" #include "UI_interface.h" #include "UI_resources.h" diff --git a/source/blender/editors/space_view3d/view3d_gizmo_navigate_type.c b/source/blender/editors/space_view3d/view3d_gizmo_navigate_type.c index e86aaccf848..a8e8d8cee96 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_navigate_type.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_navigate_type.c @@ -33,12 +33,12 @@ #include "BKE_context.h" +#include "GPU_batch.h" +#include "GPU_batch_presets.h" #include "GPU_immediate.h" #include "GPU_immediate_util.h" #include "GPU_matrix.h" #include "GPU_state.h" -#include "GPU_batch.h" -#include "GPU_batch_presets.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/space_view3d/view3d_gizmo_preselect.c b/source/blender/editors/space_view3d/view3d_gizmo_preselect.c index b9dc287b9cb..3f07653fb2f 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_preselect.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_preselect.c @@ -30,8 +30,8 @@ #include "UI_resources.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_toolsystem.h" +#include "WM_types.h" #include "view3d_intern.h" /* own include */ diff --git a/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.c b/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.c index 0a5b27a4d15..30212fcd9e5 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.c @@ -31,8 +31,8 @@ #include "DNA_mesh_types.h" #include "BKE_context.h" -#include "BKE_layer.h" #include "BKE_editmesh.h" +#include "BKE_layer.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" @@ -45,10 +45,10 @@ #include "bmesh.h" -#include "ED_screen.h" +#include "ED_gizmo_library.h" #include "ED_mesh.h" +#include "ED_screen.h" #include "ED_view3d.h" -#include "ED_gizmo_library.h" /* -------------------------------------------------------------------- */ /** \name Mesh Element (Vert/Edge/Face) Pre-Select Gizmo API diff --git a/source/blender/editors/space_view3d/view3d_gizmo_ruler.c b/source/blender/editors/space_view3d/view3d_gizmo_ruler.c index c202cc297f4..4b194d6687d 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_ruler.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_ruler.c @@ -19,9 +19,9 @@ */ #include "BLI_listbase.h" -#include "BLI_string.h" -#include "BLI_rect.h" #include "BLI_math.h" +#include "BLI_rect.h" +#include "BLI_string.h" #include "BLI_utildefines.h" #include "BLT_translation.h" @@ -31,13 +31,13 @@ #include "BKE_main.h" #include "BKE_report.h" +#include "BKE_material.h" #include "BKE_object.h" #include "BKE_unit.h" -#include "BKE_material.h" +#include "DNA_gpencil_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" -#include "DNA_gpencil_types.h" #include "DNA_view3d_types.h" #include "ED_gizmo_utils.h" @@ -46,16 +46,16 @@ #include "ED_transform_snap_object_context.h" #include "ED_view3d.h" -#include "UI_resources.h" #include "UI_interface.h" +#include "UI_resources.h" #include "MEM_guardedalloc.h" #include "RNA_access.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_toolsystem.h" +#include "WM_types.h" #include "view3d_intern.h" /* own include */ diff --git a/source/blender/editors/space_view3d/view3d_gizmo_tool_generic.c b/source/blender/editors/space_view3d/view3d_gizmo_tool_generic.c index 2a07128b227..18617b4368f 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_tool_generic.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_tool_generic.c @@ -24,10 +24,10 @@ #include "BKE_context.h" #include "BKE_global.h" -#include "ED_screen.h" -#include "ED_transform.h" #include "ED_gizmo_library.h" #include "ED_gizmo_utils.h" +#include "ED_screen.h" +#include "ED_transform.h" #include "UI_resources.h" @@ -38,9 +38,9 @@ #include "RNA_access.h" #include "WM_api.h" -#include "WM_types.h" -#include "WM_toolsystem.h" #include "WM_message.h" +#include "WM_toolsystem.h" +#include "WM_types.h" #include "view3d_intern.h" /* own include */ diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c index 200cc12a6c1..57989680705 100644 --- a/source/blender/editors/space_view3d/view3d_header.c +++ b/source/blender/editors/space_view3d/view3d_header.c @@ -21,13 +21,13 @@ * \ingroup spview3d */ -#include <string.h> #include <stdio.h> #include <stdlib.h> +#include <string.h> -#include "DNA_scene_types.h" -#include "DNA_object_types.h" #include "DNA_gpencil_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BLI_math_base.h" #include "BLI_utildefines.h" @@ -47,8 +47,8 @@ #include "WM_types.h" #include "ED_mesh.h" -#include "ED_undo.h" #include "ED_screen.h" +#include "ED_undo.h" #include "UI_interface.h" #include "UI_resources.h" diff --git a/source/blender/editors/space_view3d/view3d_iterators.c b/source/blender/editors/space_view3d/view3d_iterators.c index b446ba74b56..d8e1c8c1c72 100644 --- a/source/blender/editors/space_view3d/view3d_iterators.c +++ b/source/blender/editors/space_view3d/view3d_iterators.c @@ -18,27 +18,27 @@ * \ingroup spview3d */ +#include "DNA_armature_types.h" #include "DNA_curve_types.h" #include "DNA_lattice_types.h" -#include "DNA_meta_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "DNA_armature_types.h" +#include "DNA_meta_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BLI_utildefines.h" -#include "BLI_rect.h" #include "BLI_math_geom.h" +#include "BLI_rect.h" +#include "BLI_utildefines.h" +#include "BKE_DerivedMesh.h" #include "BKE_action.h" #include "BKE_armature.h" #include "BKE_curve.h" -#include "BKE_DerivedMesh.h" #include "BKE_displist.h" #include "BKE_editmesh.h" -#include "BKE_mesh_runtime.h" #include "BKE_mesh_iterators.h" +#include "BKE_mesh_runtime.h" #include "BKE_modifier.h" #include "DEG_depsgraph.h" @@ -46,8 +46,8 @@ #include "bmesh.h" -#include "ED_screen.h" #include "ED_armature.h" +#include "ED_screen.h" #include "ED_view3d.h" typedef struct foreachScreenObjectVert_userData { diff --git a/source/blender/editors/space_view3d/view3d_ops.c b/source/blender/editors/space_view3d/view3d_ops.c index be8824971cb..a53262df267 100644 --- a/source/blender/editors/space_view3d/view3d_ops.c +++ b/source/blender/editors/space_view3d/view3d_ops.c @@ -21,8 +21,8 @@ * \ingroup spview3d */ -#include <stdlib.h> #include <math.h> +#include <stdlib.h> #include "DNA_collection_types.h" #include "DNA_object_types.h" diff --git a/source/blender/editors/space_view3d/view3d_project.c b/source/blender/editors/space_view3d/view3d_project.c index 10791bd1c9f..3a0f0f468fc 100644 --- a/source/blender/editors/space_view3d/view3d_project.c +++ b/source/blender/editors/space_view3d/view3d_project.c @@ -23,8 +23,8 @@ #include "DNA_camera_types.h" #include "DNA_object_types.h" -#include "DNA_screen_types.h" #include "DNA_scene_types.h" +#include "DNA_screen_types.h" #include "DNA_view3d_types.h" #include "BLI_sys_types.h" /* int64_t */ diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index bfbc9b6825b..8fdef585fa2 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -21,32 +21,32 @@ * \ingroup spview3d */ -#include <string.h> -#include <stdio.h> -#include <math.h> -#include <float.h> #include <assert.h> +#include <float.h> +#include <math.h> +#include <stdio.h> +#include <string.h> #include "DNA_action_types.h" #include "DNA_armature_types.h" #include "DNA_curve_types.h" -#include "DNA_meta_types.h" +#include "DNA_gpencil_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" +#include "DNA_meta_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_tracking_types.h" -#include "DNA_gpencil_types.h" #include "MEM_guardedalloc.h" #include "BLI_array.h" #include "BLI_bitmap.h" -#include "BLI_math.h" #include "BLI_lasso_2d.h" -#include "BLI_rect.h" #include "BLI_linklist.h" #include "BLI_listbase.h" +#include "BLI_math.h" +#include "BLI_rect.h" #include "BLI_string.h" #include "BLI_utildefines.h" @@ -55,20 +55,20 @@ #endif /* vertex box select */ -#include "IMB_imbuf_types.h" -#include "IMB_imbuf.h" #include "BKE_global.h" #include "BKE_main.h" +#include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "BKE_armature.h" #include "BKE_context.h" #include "BKE_curve.h" +#include "BKE_editmesh.h" #include "BKE_layer.h" #include "BKE_mball.h" #include "BKE_mesh.h" #include "BKE_object.h" #include "BKE_paint.h" -#include "BKE_editmesh.h" #include "BKE_scene.h" #include "BKE_tracking.h" #include "BKE_workspace.h" @@ -84,16 +84,16 @@ #include "ED_armature.h" #include "ED_curve.h" +#include "ED_gpencil.h" #include "ED_lattice.h" -#include "ED_particle.h" +#include "ED_mball.h" #include "ED_mesh.h" #include "ED_object.h" #include "ED_outliner.h" +#include "ED_particle.h" #include "ED_screen.h" -#include "ED_select_utils.h" #include "ED_sculpt.h" -#include "ED_mball.h" -#include "ED_gpencil.h" +#include "ED_select_utils.h" #include "UI_interface.h" diff --git a/source/blender/editors/space_view3d/view3d_snap.c b/source/blender/editors/space_view3d/view3d_snap.c index f7c8e814644..437c0dd4035 100644 --- a/source/blender/editors/space_view3d/view3d_snap.c +++ b/source/blender/editors/space_view3d/view3d_snap.c @@ -28,8 +28,8 @@ #include "BLI_array.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "BKE_action.h" #include "BKE_armature.h" @@ -52,10 +52,10 @@ #include "RNA_access.h" #include "RNA_define.h" -#include "ED_object.h" -#include "ED_transverts.h" #include "ED_keyframing.h" +#include "ED_object.h" #include "ED_screen.h" +#include "ED_transverts.h" #include "view3d_intern.h" diff --git a/source/blender/editors/space_view3d/view3d_utils.c b/source/blender/editors/space_view3d/view3d_utils.c index 55778db7353..2637fb6d1db 100644 --- a/source/blender/editors/space_view3d/view3d_utils.c +++ b/source/blender/editors/space_view3d/view3d_utils.c @@ -23,10 +23,10 @@ * 3D View checks and manipulation (no operators). */ -#include <string.h> -#include <stdio.h> -#include <math.h> #include <float.h> +#include <math.h> +#include <stdio.h> +#include <string.h> #include "DNA_camera_types.h" #include "DNA_curve_types.h" @@ -44,8 +44,8 @@ #include "BKE_camera.h" #include "BKE_context.h" #include "BKE_object.h" -#include "BKE_screen.h" #include "BKE_scene.h" +#include "BKE_screen.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index 159ea249337..6e1533e50fd 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -22,26 +22,26 @@ */ #include "DNA_camera_types.h" -#include "DNA_scene_types.h" #include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "MEM_guardedalloc.h" +#include "BLI_linklist.h" #include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_rect.h" #include "BLI_utildefines.h" -#include "BLI_linklist.h" #include "BKE_action.h" #include "BKE_camera.h" #include "BKE_context.h" -#include "BKE_idprop.h" -#include "BKE_object.h" #include "BKE_global.h" +#include "BKE_idprop.h" #include "BKE_layer.h" #include "BKE_main.h" #include "BKE_modifier.h" +#include "BKE_object.h" #include "BKE_report.h" #include "BKE_scene.h" @@ -51,8 +51,8 @@ #include "UI_resources.h" #include "GPU_glew.h" -#include "GPU_select.h" #include "GPU_matrix.h" +#include "GPU_select.h" #include "GPU_state.h" #include "WM_api.h" diff --git a/source/blender/editors/space_view3d/view3d_walk.c b/source/blender/editors/space_view3d/view3d_walk.c index e25f8b4b8ad..89b5618075a 100644 --- a/source/blender/editors/space_view3d/view3d_walk.c +++ b/source/blender/editors/space_view3d/view3d_walk.c @@ -20,14 +20,14 @@ /* defines VIEW3D_OT_navigate - walk modal operator */ -#include "DNA_scene_types.h" #include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_blenlib.h" #include "BLI_kdopbvh.h" +#include "BLI_math.h" #include "BLI_utildefines.h" #include "BKE_context.h" diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 260748ce953..0ea355e9b6e 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -32,8 +32,8 @@ #include "BLI_math.h" #include "BLI_rect.h" -#include "BKE_editmesh.h" #include "BKE_context.h" +#include "BKE_editmesh.h" #include "BKE_mask.h" #include "BKE_scene.h" @@ -43,10 +43,10 @@ #include "ED_gpencil.h" #include "ED_image.h" #include "ED_keyframing.h" +#include "ED_node.h" #include "ED_screen.h" #include "ED_sculpt.h" #include "ED_space_api.h" -#include "ED_node.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h index 2a4268ad939..a2c8caba0f5 100644 --- a/source/blender/editors/transform/transform.h +++ b/source/blender/editors/transform/transform.h @@ -24,8 +24,8 @@ #ifndef __TRANSFORM_H__ #define __TRANSFORM_H__ -#include "ED_transform.h" #include "ED_numinput.h" +#include "ED_transform.h" #include "ED_view3d.h" #include "RE_engine.h" diff --git a/source/blender/editors/transform/transform_constraints.c b/source/blender/editors/transform/transform_constraints.c index 1db2ffa0ed4..4b6932d977d 100644 --- a/source/blender/editors/transform/transform_constraints.c +++ b/source/blender/editors/transform/transform_constraints.c @@ -21,10 +21,10 @@ * \ingroup edtransform */ -#include <stdlib.h> +#include <math.h> #include <stdio.h> +#include <stdlib.h> #include <string.h> -#include <math.h> #include "DNA_object_types.h" #include "DNA_scene_types.h" @@ -37,9 +37,9 @@ #include "GPU_state.h" #include "BLI_math.h" -#include "BLI_utildefines.h" -#include "BLI_string.h" #include "BLI_rect.h" +#include "BLI_string.h" +#include "BLI_utildefines.h" #include "BKE_context.h" diff --git a/source/blender/editors/transform/transform_convert.c b/source/blender/editors/transform/transform_convert.c index 0a2e05e6f49..09ee9081baf 100644 --- a/source/blender/editors/transform/transform_convert.c +++ b/source/blender/editors/transform/transform_convert.c @@ -23,51 +23,51 @@ #include "DNA_anim_types.h" #include "DNA_armature_types.h" -#include "DNA_space_types.h" #include "DNA_constraint_types.h" #include "DNA_gpencil_types.h" #include "DNA_mask_types.h" +#include "DNA_space_types.h" #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_kdtree.h" #include "BLI_listbase.h" +#include "BLI_math.h" #include "BLI_string.h" -#include "BLI_kdtree.h" #include "BKE_animsys.h" #include "BKE_armature.h" #include "BKE_context.h" +#include "BKE_editmesh.h" #include "BKE_fcurve.h" #include "BKE_global.h" #include "BKE_gpencil.h" -#include "BKE_layer.h" #include "BKE_key.h" +#include "BKE_layer.h" #include "BKE_main.h" +#include "BKE_mask.h" #include "BKE_modifier.h" #include "BKE_nla.h" #include "BKE_node.h" #include "BKE_pointcache.h" #include "BKE_rigidbody.h" #include "BKE_scene.h" -#include "BKE_editmesh.h" #include "BKE_tracking.h" -#include "BKE_mask.h" #include "BIK_api.h" #include "ED_anim_api.h" #include "ED_armature.h" -#include "ED_particle.h" +#include "ED_clip.h" #include "ED_image.h" -#include "ED_keyframing.h" #include "ED_keyframes_edit.h" -#include "ED_object.h" +#include "ED_keyframing.h" #include "ED_markers.h" +#include "ED_mask.h" #include "ED_mesh.h" #include "ED_node.h" -#include "ED_clip.h" -#include "ED_mask.h" +#include "ED_object.h" +#include "ED_particle.h" #include "UI_view2d.h" diff --git a/source/blender/editors/transform/transform_convert_action.c b/source/blender/editors/transform/transform_convert_action.c index f1bc54f12d1..c9273121df5 100644 --- a/source/blender/editors/transform/transform_convert_action.c +++ b/source/blender/editors/transform/transform_convert_action.c @@ -30,8 +30,8 @@ #include "BLI_math.h" #include "BLI_rect.h" -#include "BKE_nla.h" #include "BKE_context.h" +#include "BKE_nla.h" #include "BKE_report.h" #include "ED_anim_api.h" diff --git a/source/blender/editors/transform/transform_convert_mesh.c b/source/blender/editors/transform/transform_convert_mesh.c index 14f07387046..29a74be8e2b 100644 --- a/source/blender/editors/transform/transform_convert_mesh.c +++ b/source/blender/editors/transform/transform_convert_mesh.c @@ -29,9 +29,9 @@ #include "BLI_alloca.h" #include "BLI_bitmap.h" +#include "BLI_linklist_stack.h" #include "BLI_math.h" #include "BLI_memarena.h" -#include "BLI_linklist_stack.h" #include "BKE_context.h" #include "BKE_crazyspace.h" diff --git a/source/blender/editors/transform/transform_convert_nla.c b/source/blender/editors/transform/transform_convert_nla.c index 7c34c583210..580a8d79d7a 100644 --- a/source/blender/editors/transform/transform_convert_nla.c +++ b/source/blender/editors/transform/transform_convert_nla.c @@ -26,11 +26,11 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_listbase.h" +#include "BLI_math.h" -#include "BKE_nla.h" #include "BKE_context.h" +#include "BKE_nla.h" #include "BKE_report.h" #include "ED_anim_api.h" diff --git a/source/blender/editors/transform/transform_convert_particle.c b/source/blender/editors/transform/transform_convert_particle.c index 9054897b7dd..4e1fc6ae1fa 100644 --- a/source/blender/editors/transform/transform_convert_particle.c +++ b/source/blender/editors/transform/transform_convert_particle.c @@ -21,8 +21,8 @@ * \ingroup edtransform */ -#include "DNA_particle_types.h" #include "DNA_modifier_types.h" +#include "DNA_particle_types.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/transform/transform_convert_sculpt.c b/source/blender/editors/transform/transform_convert_sculpt.c index 600c51dc0d7..55dc36e9693 100644 --- a/source/blender/editors/transform/transform_convert_sculpt.c +++ b/source/blender/editors/transform/transform_convert_sculpt.c @@ -26,8 +26,8 @@ #include "BLI_math.h" #include "BKE_context.h" -#include "BKE_report.h" #include "BKE_paint.h" +#include "BKE_report.h" #include "transform.h" #include "transform_convert.h" diff --git a/source/blender/editors/transform/transform_convert_sequencer.c b/source/blender/editors/transform/transform_convert_sequencer.c index a35c814ee23..f6dc9b9c412 100644 --- a/source/blender/editors/transform/transform_convert_sequencer.c +++ b/source/blender/editors/transform/transform_convert_sequencer.c @@ -28,8 +28,8 @@ #include "BLI_math.h" #include "BKE_context.h" -#include "BKE_sequencer.h" #include "BKE_report.h" +#include "BKE_sequencer.h" #include "transform.h" #include "transform_convert.h" diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 716df24f195..ca0eb40e7b1 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -21,8 +21,8 @@ * \ingroup edtransform */ -#include <string.h> #include <math.h> +#include <string.h> #include "MEM_guardedalloc.h" @@ -34,20 +34,20 @@ #include "DNA_constraint_types.h" #include "DNA_gpencil_types.h" #include "DNA_lattice_types.h" +#include "DNA_mask_types.h" +#include "DNA_mesh_types.h" +#include "DNA_meta_types.h" +#include "DNA_modifier_types.h" +#include "DNA_movieclip_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "DNA_screen_types.h" #include "DNA_sequence_types.h" #include "DNA_space_types.h" -#include "DNA_scene_types.h" -#include "DNA_object_types.h" -#include "DNA_mesh_types.h" #include "DNA_view3d_types.h" -#include "DNA_modifier_types.h" -#include "DNA_movieclip_types.h" -#include "DNA_mask_types.h" -#include "DNA_meta_types.h" -#include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_math.h" #include "BLI_rand.h" #include "BLI_utildefines.h" @@ -86,24 +86,24 @@ #include "ED_anim_api.h" #include "ED_armature.h" +#include "ED_clip.h" +#include "ED_curve.h" /* for curve_editnurbs */ +#include "ED_gpencil.h" #include "ED_image.h" #include "ED_keyframing.h" #include "ED_markers.h" #include "ED_mesh.h" #include "ED_object.h" #include "ED_particle.h" +#include "ED_screen.h" #include "ED_screen_types.h" +#include "ED_sculpt.h" #include "ED_space_api.h" #include "ED_uvedit.h" #include "ED_view3d.h" -#include "ED_curve.h" /* for curve_editnurbs */ -#include "ED_clip.h" -#include "ED_screen.h" -#include "ED_gpencil.h" -#include "ED_sculpt.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" #include "RE_engine.h" diff --git a/source/blender/editors/transform/transform_gizmo_2d.c b/source/blender/editors/transform/transform_gizmo_2d.c index 82d51141a8b..dce2625e8a1 100644 --- a/source/blender/editors/transform/transform_gizmo_2d.c +++ b/source/blender/editors/transform/transform_gizmo_2d.c @@ -42,15 +42,15 @@ #include "UI_view2d.h" #include "WM_api.h" +#include "WM_message.h" #include "WM_types.h" #include "wm.h" /* XXX */ -#include "WM_message.h" +#include "ED_gizmo_library.h" #include "ED_gizmo_utils.h" #include "ED_image.h" #include "ED_screen.h" #include "ED_uvedit.h" -#include "ED_gizmo_library.h" #include "transform.h" /* own include */ diff --git a/source/blender/editors/transform/transform_gizmo_3d.c b/source/blender/editors/transform/transform_gizmo_3d.c index 57f302e2d50..de7b2ec02de 100644 --- a/source/blender/editors/transform/transform_gizmo_3d.c +++ b/source/blender/editors/transform/transform_gizmo_3d.c @@ -22,58 +22,58 @@ * Used for 3D View */ +#include <float.h> +#include <math.h> #include <stdlib.h> #include <string.h> -#include <math.h> -#include <float.h> #include "DNA_armature_types.h" #include "DNA_curve_types.h" #include "DNA_gpencil_types.h" #include "DNA_lattice_types.h" #include "DNA_meta_types.h" -#include "DNA_screen_types.h" #include "DNA_scene_types.h" +#include "DNA_screen_types.h" #include "DNA_view3d_types.h" #include "BLI_array_utils.h" #include "BLI_listbase.h" #include "BLI_math.h" -#include "BLI_utildefines.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "BKE_action.h" #include "BKE_context.h" #include "BKE_curve.h" +#include "BKE_editmesh.h" #include "BKE_global.h" +#include "BKE_gpencil.h" +#include "BKE_lattice.h" #include "BKE_layer.h" +#include "BKE_object.h" +#include "BKE_paint.h" #include "BKE_particle.h" #include "BKE_pointcache.h" -#include "BKE_editmesh.h" -#include "BKE_lattice.h" -#include "BKE_gpencil.h" #include "BKE_scene.h" #include "BKE_workspace.h" -#include "BKE_object.h" -#include "BKE_paint.h" #include "DEG_depsgraph.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" #include "WM_toolsystem.h" +#include "WM_types.h" #include "wm.h" #include "ED_armature.h" #include "ED_curve.h" +#include "ED_gizmo_library.h" +#include "ED_gizmo_utils.h" +#include "ED_gpencil.h" #include "ED_object.h" #include "ED_particle.h" -#include "ED_view3d.h" -#include "ED_gpencil.h" #include "ED_screen.h" -#include "ED_gizmo_library.h" -#include "ED_gizmo_utils.h" +#include "ED_view3d.h" #include "UI_interface.h" #include "UI_resources.h" diff --git a/source/blender/editors/transform/transform_gizmo_extrude_3d.c b/source/blender/editors/transform/transform_gizmo_extrude_3d.c index 8b5db2b57ec..e6e74668c2c 100644 --- a/source/blender/editors/transform/transform_gizmo_extrude_3d.c +++ b/source/blender/editors/transform/transform_gizmo_extrude_3d.c @@ -18,10 +18,10 @@ * \ingroup edmesh */ -#include "BLI_utildefines.h" #include "BLI_array_utils.h" -#include "BLI_math.h" #include "BLI_listbase.h" +#include "BLI_math.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_global.h" @@ -30,15 +30,15 @@ #include "RNA_define.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" #include "WM_toolsystem.h" +#include "WM_types.h" +#include "ED_gizmo_library.h" +#include "ED_gizmo_utils.h" #include "ED_screen.h" #include "ED_transform.h" #include "ED_view3d.h" -#include "ED_gizmo_library.h" -#include "ED_gizmo_utils.h" #include "UI_resources.h" diff --git a/source/blender/editors/transform/transform_input.c b/source/blender/editors/transform/transform_input.c index fc71457171d..75463dcb7db 100644 --- a/source/blender/editors/transform/transform_input.c +++ b/source/blender/editors/transform/transform_input.c @@ -18,8 +18,8 @@ * \ingroup edtransform */ -#include <stdlib.h> #include <math.h> +#include <stdlib.h> #include "DNA_screen_types.h" @@ -28,8 +28,8 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" #include "transform.h" diff --git a/source/blender/editors/transform/transform_mode_baketime.c b/source/blender/editors/transform/transform_mode_baketime.c index b19fabfbb04..0feaa27d4ce 100644 --- a/source/blender/editors/transform/transform_mode_baketime.c +++ b/source/blender/editors/transform/transform_mode_baketime.c @@ -36,8 +36,8 @@ #include "BLT_translation.h" #include "transform.h" -#include "transform_snap.h" #include "transform_mode.h" +#include "transform_snap.h" /* -------------------------------------------------------------------- */ /* Transform (Bake-Time) */ diff --git a/source/blender/editors/transform/transform_mode_bbone_resize.c b/source/blender/editors/transform/transform_mode_bbone_resize.c index 93d4bee4a12..1a32a550cb0 100644 --- a/source/blender/editors/transform/transform_mode_bbone_resize.c +++ b/source/blender/editors/transform/transform_mode_bbone_resize.c @@ -37,8 +37,8 @@ #include "transform.h" #include "transform_constraints.h" -#include "transform_snap.h" #include "transform_mode.h" +#include "transform_snap.h" /* -------------------------------------------------------------------- */ /* Transform (EditBone (B-bone) width scaling) */ diff --git a/source/blender/editors/transform/transform_mode_bend.c b/source/blender/editors/transform/transform_mode_bend.c index d4c39ac969b..bf80673fbb4 100644 --- a/source/blender/editors/transform/transform_mode_bend.c +++ b/source/blender/editors/transform/transform_mode_bend.c @@ -43,8 +43,8 @@ #include "BLT_translation.h" #include "transform.h" -#include "transform_snap.h" #include "transform_mode.h" +#include "transform_snap.h" /* -------------------------------------------------------------------- */ /* Transform (Bend) */ diff --git a/source/blender/editors/transform/transform_mode_boneenvelope.c b/source/blender/editors/transform/transform_mode_boneenvelope.c index 006cb1b0cc4..0886d4e01ef 100644 --- a/source/blender/editors/transform/transform_mode_boneenvelope.c +++ b/source/blender/editors/transform/transform_mode_boneenvelope.c @@ -36,8 +36,8 @@ #include "BLT_translation.h" #include "transform.h" -#include "transform_snap.h" #include "transform_mode.h" +#include "transform_snap.h" /* -------------------------------------------------------------------- */ /* Transform (Bone Envelope) */ diff --git a/source/blender/editors/transform/transform_mode_boneroll.c b/source/blender/editors/transform/transform_mode_boneroll.c index 37c7e2bdaf5..8e9d680f269 100644 --- a/source/blender/editors/transform/transform_mode_boneroll.c +++ b/source/blender/editors/transform/transform_mode_boneroll.c @@ -36,8 +36,8 @@ #include "BLT_translation.h" #include "transform.h" -#include "transform_snap.h" #include "transform_mode.h" +#include "transform_snap.h" /* -------------------------------------------------------------------- */ /* Transform (EditBone Roll) */ diff --git a/source/blender/editors/transform/transform_mode_curveshrinkfatten.c b/source/blender/editors/transform/transform_mode_curveshrinkfatten.c index 17a2072bbfe..6ccb0e757c3 100644 --- a/source/blender/editors/transform/transform_mode_curveshrinkfatten.c +++ b/source/blender/editors/transform/transform_mode_curveshrinkfatten.c @@ -36,8 +36,8 @@ #include "BLT_translation.h" #include "transform.h" -#include "transform_snap.h" #include "transform_mode.h" +#include "transform_snap.h" /* -------------------------------------------------------------------- */ /* Transform (Curve Shrink/Fatten) */ diff --git a/source/blender/editors/transform/transform_mode_edge_bevelweight.c b/source/blender/editors/transform/transform_mode_edge_bevelweight.c index e75ebbdeca3..15a9e7384b1 100644 --- a/source/blender/editors/transform/transform_mode_edge_bevelweight.c +++ b/source/blender/editors/transform/transform_mode_edge_bevelweight.c @@ -36,8 +36,8 @@ #include "BLT_translation.h" #include "transform.h" -#include "transform_snap.h" #include "transform_mode.h" +#include "transform_snap.h" /* -------------------------------------------------------------------- */ /* Transform (Bevel Weight) */ diff --git a/source/blender/editors/transform/transform_mode_edge_crease.c b/source/blender/editors/transform/transform_mode_edge_crease.c index e4e8e07f95e..8865721bc7e 100644 --- a/source/blender/editors/transform/transform_mode_edge_crease.c +++ b/source/blender/editors/transform/transform_mode_edge_crease.c @@ -36,8 +36,8 @@ #include "BLT_translation.h" #include "transform.h" -#include "transform_snap.h" #include "transform_mode.h" +#include "transform_snap.h" /* -------------------------------------------------------------------- */ /* Transform (Crease) */ diff --git a/source/blender/editors/transform/transform_mode_edge_rotate_normal.c b/source/blender/editors/transform/transform_mode_edge_rotate_normal.c index 341c98c30d8..69cd909cff9 100644 --- a/source/blender/editors/transform/transform_mode_edge_rotate_normal.c +++ b/source/blender/editors/transform/transform_mode_edge_rotate_normal.c @@ -25,8 +25,8 @@ #include "BLI_math.h" -#include "BKE_editmesh.h" #include "BKE_context.h" +#include "BKE_editmesh.h" #include "BKE_mesh.h" #include "BKE_unit.h" @@ -35,8 +35,8 @@ #include "UI_interface.h" #include "transform.h" -#include "transform_snap.h" #include "transform_mode.h" +#include "transform_snap.h" /* -------------------------------------------------------------------- */ /* Transform (Normal Rotation) */ diff --git a/source/blender/editors/transform/transform_mode_edge_seq_slide.c b/source/blender/editors/transform/transform_mode_edge_seq_slide.c index 0b6b72d9eee..e23e5c188c8 100644 --- a/source/blender/editors/transform/transform_mode_edge_seq_slide.c +++ b/source/blender/editors/transform/transform_mode_edge_seq_slide.c @@ -38,8 +38,8 @@ #include "BLT_translation.h" #include "transform.h" -#include "transform_snap.h" #include "transform_mode.h" +#include "transform_snap.h" /* -------------------------------------------------------------------- */ /* Transform (Sequencer Slide) */ diff --git a/source/blender/editors/transform/transform_mode_edge_slide.c b/source/blender/editors/transform/transform_mode_edge_slide.c index a012d89d107..b54e6afc9a1 100644 --- a/source/blender/editors/transform/transform_mode_edge_slide.c +++ b/source/blender/editors/transform/transform_mode_edge_slide.c @@ -51,8 +51,8 @@ #include "transform.h" #include "transform_convert.h" -#include "transform_snap.h" #include "transform_mode.h" +#include "transform_snap.h" /* -------------------------------------------------------------------- */ /* Transform (Edge Slide) */ diff --git a/source/blender/editors/transform/transform_mode_gpopacity.c b/source/blender/editors/transform/transform_mode_gpopacity.c index 0d8b5d2a5c9..460e2b41da8 100644 --- a/source/blender/editors/transform/transform_mode_gpopacity.c +++ b/source/blender/editors/transform/transform_mode_gpopacity.c @@ -36,8 +36,8 @@ #include "BLT_translation.h" #include "transform.h" -#include "transform_snap.h" #include "transform_mode.h" +#include "transform_snap.h" /* -------------------------------------------------------------------- */ /* Transform (GPencil Opacity) */ diff --git a/source/blender/editors/transform/transform_mode_gpshrinkfatten.c b/source/blender/editors/transform/transform_mode_gpshrinkfatten.c index 84ea3f5f684..edb353b343d 100644 --- a/source/blender/editors/transform/transform_mode_gpshrinkfatten.c +++ b/source/blender/editors/transform/transform_mode_gpshrinkfatten.c @@ -36,8 +36,8 @@ #include "BLT_translation.h" #include "transform.h" -#include "transform_snap.h" #include "transform_mode.h" +#include "transform_snap.h" /* -------------------------------------------------------------------- */ /* Transform (GPencil Shrink/Fatten) */ diff --git a/source/blender/editors/transform/transform_mode_maskshrinkfatten.c b/source/blender/editors/transform/transform_mode_maskshrinkfatten.c index 9405a66162a..b6719067f5b 100644 --- a/source/blender/editors/transform/transform_mode_maskshrinkfatten.c +++ b/source/blender/editors/transform/transform_mode_maskshrinkfatten.c @@ -36,8 +36,8 @@ #include "BLT_translation.h" #include "transform.h" -#include "transform_snap.h" #include "transform_mode.h" +#include "transform_snap.h" /* -------------------------------------------------------------------- */ /* Transform (Mask Shrink/Fatten) */ diff --git a/source/blender/editors/transform/transform_mode_push_pull.c b/source/blender/editors/transform/transform_mode_push_pull.c index c3edcdcf65c..890fc820cd5 100644 --- a/source/blender/editors/transform/transform_mode_push_pull.c +++ b/source/blender/editors/transform/transform_mode_push_pull.c @@ -37,8 +37,8 @@ #include "transform.h" #include "transform_constraints.h" -#include "transform_snap.h" #include "transform_mode.h" +#include "transform_snap.h" /* -------------------------------------------------------------------- */ /* Transform (Push/Pull) */ diff --git a/source/blender/editors/transform/transform_mode_resize.c b/source/blender/editors/transform/transform_mode_resize.c index 3071c8f351e..59f2ab5c294 100644 --- a/source/blender/editors/transform/transform_mode_resize.c +++ b/source/blender/editors/transform/transform_mode_resize.c @@ -35,8 +35,8 @@ #include "transform.h" #include "transform_constraints.h" #include "transform_convert.h" -#include "transform_snap.h" #include "transform_mode.h" +#include "transform_snap.h" /* -------------------------------------------------------------------- */ /* Transform (Resize) */ diff --git a/source/blender/editors/transform/transform_mode_rotate.c b/source/blender/editors/transform/transform_mode_rotate.c index 8a6024bb8fb..bea039194d0 100644 --- a/source/blender/editors/transform/transform_mode_rotate.c +++ b/source/blender/editors/transform/transform_mode_rotate.c @@ -33,8 +33,8 @@ #include "UI_interface.h" #include "transform.h" -#include "transform_snap.h" #include "transform_mode.h" +#include "transform_snap.h" /* -------------------------------------------------------------------- */ /* Transform (Rotation) */ diff --git a/source/blender/editors/transform/transform_mode_shear.c b/source/blender/editors/transform/transform_mode_shear.c index c3313046a11..8b7dc12f41b 100644 --- a/source/blender/editors/transform/transform_mode_shear.c +++ b/source/blender/editors/transform/transform_mode_shear.c @@ -40,8 +40,8 @@ #include "BLT_translation.h" #include "transform.h" -#include "transform_snap.h" #include "transform_mode.h" +#include "transform_snap.h" /* -------------------------------------------------------------------- */ /* Transform (Shear) */ diff --git a/source/blender/editors/transform/transform_mode_shrink_fatten.c b/source/blender/editors/transform/transform_mode_shrink_fatten.c index 0679057de26..e24e63f445c 100644 --- a/source/blender/editors/transform/transform_mode_shrink_fatten.c +++ b/source/blender/editors/transform/transform_mode_shrink_fatten.c @@ -38,8 +38,8 @@ #include "BLT_translation.h" #include "transform.h" -#include "transform_snap.h" #include "transform_mode.h" +#include "transform_snap.h" /* -------------------------------------------------------------------- */ /* Transform (Shrink-Fatten) */ diff --git a/source/blender/editors/transform/transform_mode_skin_resize.c b/source/blender/editors/transform/transform_mode_skin_resize.c index 0cb774bc4a0..23ba9a07f3e 100644 --- a/source/blender/editors/transform/transform_mode_skin_resize.c +++ b/source/blender/editors/transform/transform_mode_skin_resize.c @@ -34,8 +34,8 @@ #include "transform.h" #include "transform_constraints.h" -#include "transform_snap.h" #include "transform_mode.h" +#include "transform_snap.h" /* -------------------------------------------------------------------- */ /* Transform (Skin) */ diff --git a/source/blender/editors/transform/transform_mode_tilt.c b/source/blender/editors/transform/transform_mode_tilt.c index c57c5e83de8..9ae0cfdf805 100644 --- a/source/blender/editors/transform/transform_mode_tilt.c +++ b/source/blender/editors/transform/transform_mode_tilt.c @@ -36,8 +36,8 @@ #include "BLT_translation.h" #include "transform.h" -#include "transform_snap.h" #include "transform_mode.h" +#include "transform_snap.h" /* -------------------------------------------------------------------- */ /* Transform (Tilt) */ diff --git a/source/blender/editors/transform/transform_mode_timetranslate.c b/source/blender/editors/transform/transform_mode_timetranslate.c index 3ea97d152ef..494609cafb0 100644 --- a/source/blender/editors/transform/transform_mode_timetranslate.c +++ b/source/blender/editors/transform/transform_mode_timetranslate.c @@ -40,8 +40,8 @@ #include "BLT_translation.h" #include "transform.h" -#include "transform_snap.h" #include "transform_mode.h" +#include "transform_snap.h" /* -------------------------------------------------------------------- */ /* Transform (Animation Translation) */ diff --git a/source/blender/editors/transform/transform_mode_tosphere.c b/source/blender/editors/transform/transform_mode_tosphere.c index d198cd6eeb2..5a3b138823c 100644 --- a/source/blender/editors/transform/transform_mode_tosphere.c +++ b/source/blender/editors/transform/transform_mode_tosphere.c @@ -36,8 +36,8 @@ #include "BLT_translation.h" #include "transform.h" -#include "transform_snap.h" #include "transform_mode.h" +#include "transform_snap.h" /* -------------------------------------------------------------------- */ /* Transform (ToSphere) */ diff --git a/source/blender/editors/transform/transform_mode_trackball.c b/source/blender/editors/transform/transform_mode_trackball.c index d3abf782eb8..758ee3b9cae 100644 --- a/source/blender/editors/transform/transform_mode_trackball.c +++ b/source/blender/editors/transform/transform_mode_trackball.c @@ -36,8 +36,8 @@ #include "BLT_translation.h" #include "transform.h" -#include "transform_snap.h" #include "transform_mode.h" +#include "transform_snap.h" /* -------------------------------------------------------------------- */ /* Transform (Rotation - Trackball) */ diff --git a/source/blender/editors/transform/transform_mode_translate.c b/source/blender/editors/transform/transform_mode_translate.c index 978b36835cd..aef5a999d18 100644 --- a/source/blender/editors/transform/transform_mode_translate.c +++ b/source/blender/editors/transform/transform_mode_translate.c @@ -44,8 +44,8 @@ #include "transform.h" #include "transform_convert.h" -#include "transform_snap.h" #include "transform_mode.h" +#include "transform_snap.h" /* -------------------------------------------------------------------- */ /* Transform (Translation) */ diff --git a/source/blender/editors/transform/transform_mode_vert_slide.c b/source/blender/editors/transform/transform_mode_vert_slide.c index 15f999d37ec..2325c4d1d26 100644 --- a/source/blender/editors/transform/transform_mode_vert_slide.c +++ b/source/blender/editors/transform/transform_mode_vert_slide.c @@ -48,8 +48,8 @@ #include "transform.h" #include "transform_convert.h" -#include "transform_snap.h" #include "transform_mode.h" +#include "transform_snap.h" /* -------------------------------------------------------------------- */ /* Transform (Vert Slide) */ diff --git a/source/blender/editors/transform/transform_ops.c b/source/blender/editors/transform/transform_ops.c index ee1353a28fa..aaf7fbc3108 100644 --- a/source/blender/editors/transform/transform_ops.c +++ b/source/blender/editors/transform/transform_ops.c @@ -30,10 +30,10 @@ #include "BLT_translation.h" #include "BKE_context.h" -#include "BKE_global.h" -#include "BKE_report.h" #include "BKE_editmesh.h" +#include "BKE_global.h" #include "BKE_layer.h" +#include "BKE_report.h" #include "BKE_scene.h" #include "RNA_access.h" @@ -42,8 +42,8 @@ #include "WM_api.h" #include "WM_message.h" -#include "WM_types.h" #include "WM_toolsystem.h" +#include "WM_types.h" #include "UI_interface.h" #include "UI_resources.h" diff --git a/source/blender/editors/transform/transform_orientations.c b/source/blender/editors/transform/transform_orientations.c index 3f08f795d32..5cc1feddf7a 100644 --- a/source/blender/editors/transform/transform_orientations.c +++ b/source/blender/editors/transform/transform_orientations.c @@ -18,9 +18,9 @@ * \ingroup edtransform */ -#include <string.h> -#include <stddef.h> #include <ctype.h> +#include <stddef.h> +#include <string.h> #include "MEM_guardedalloc.h" @@ -34,15 +34,15 @@ #include "DNA_view3d_types.h" #include "DNA_workspace_types.h" -#include "BLI_math.h" #include "BLI_listbase.h" +#include "BLI_math.h" #include "BLI_string.h" #include "BLI_string_utils.h" #include "BLI_utildefines.h" #include "BKE_action.h" -#include "BKE_curve.h" #include "BKE_context.h" +#include "BKE_curve.h" #include "BKE_editmesh.h" #include "BKE_layer.h" #include "BKE_report.h" diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c index 0a0a6ffd62f..86e99c986f8 100644 --- a/source/blender/editors/transform/transform_snap.c +++ b/source/blender/editors/transform/transform_snap.c @@ -21,36 +21,36 @@ * \ingroup edtransform */ -#include <stdlib.h> -#include <math.h> #include <float.h> +#include <math.h> #include <stdio.h> +#include <stdlib.h> #include "PIL_time.h" -#include "DNA_scene_types.h" -#include "DNA_object_types.h" #include "DNA_meshdata_types.h" /* Temporary, for snapping to other unselected meshes */ #include "DNA_node_types.h" -#include "DNA_space_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 "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_math.h" #include "BLI_utildefines.h" #include "GPU_immediate.h" #include "GPU_state.h" -#include "BKE_layer.h" -#include "BKE_object.h" #include "BKE_anim.h" /* for duplis */ #include "BKE_context.h" #include "BKE_editmesh.h" -#include "BKE_sequencer.h" +#include "BKE_layer.h" #include "BKE_main.h" +#include "BKE_object.h" +#include "BKE_sequencer.h" #include "RNA_access.h" @@ -59,9 +59,9 @@ #include "ED_image.h" #include "ED_markers.h" #include "ED_node.h" +#include "ED_transform_snap_object_context.h" #include "ED_uvedit.h" #include "ED_view3d.h" -#include "ED_transform_snap_object_context.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/transform/transform_snap_object.c b/source/blender/editors/transform/transform_snap_object.c index af2804a9161..f55c73fd15e 100644 --- a/source/blender/editors/transform/transform_snap_object.c +++ b/source/blender/editors/transform/transform_snap_object.c @@ -22,11 +22,11 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" -#include "BLI_kdopbvh.h" -#include "BLI_memarena.h" #include "BLI_ghash.h" +#include "BLI_kdopbvh.h" #include "BLI_listbase.h" +#include "BLI_math.h" +#include "BLI_memarena.h" #include "BLI_utildefines.h" #include "DNA_armature_types.h" @@ -38,23 +38,23 @@ #include "DNA_screen_types.h" #include "DNA_view3d_types.h" -#include "BKE_bvhutils.h" +#include "BKE_anim.h" /* for duplis */ #include "BKE_armature.h" +#include "BKE_bvhutils.h" #include "BKE_curve.h" -#include "BKE_object.h" -#include "BKE_anim.h" /* for duplis */ #include "BKE_editmesh.h" #include "BKE_layer.h" #include "BKE_main.h" -#include "BKE_tracking.h" #include "BKE_mesh.h" #include "BKE_mesh_runtime.h" +#include "BKE_object.h" +#include "BKE_tracking.h" #include "DEG_depsgraph_query.h" +#include "ED_armature.h" #include "ED_transform_snap_object_context.h" #include "ED_view3d.h" -#include "ED_armature.h" #include "ED_transform.h" diff --git a/source/blender/editors/undo/ed_undo.c b/source/blender/editors/undo/ed_undo.c index cb4f4dfa46c..123fd5f35da 100644 --- a/source/blender/editors/undo/ed_undo.c +++ b/source/blender/editors/undo/ed_undo.c @@ -27,11 +27,11 @@ #include "CLG_log.h" -#include "DNA_scene_types.h" #include "DNA_object_types.h" +#include "DNA_scene_types.h" -#include "BLI_utildefines.h" #include "BLI_listbase.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" @@ -39,27 +39,27 @@ #include "BKE_callbacks.h" #include "BKE_context.h" #include "BKE_global.h" +#include "BKE_layer.h" #include "BKE_main.h" +#include "BKE_paint.h" #include "BKE_report.h" #include "BKE_scene.h" #include "BKE_screen.h" -#include "BKE_layer.h" #include "BKE_undo_system.h" #include "BKE_workspace.h" -#include "BKE_paint.h" #include "BLO_blend_validate.h" #include "ED_gpencil.h" -#include "ED_render.h" #include "ED_object.h" #include "ED_outliner.h" +#include "ED_render.h" #include "ED_screen.h" #include "ED_undo.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_toolsystem.h" +#include "WM_types.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/undo/memfile_undo.c b/source/blender/editors/undo/memfile_undo.c index f9235938eb7..086aa6c4c9d 100644 --- a/source/blender/editors/undo/memfile_undo.c +++ b/source/blender/editors/undo/memfile_undo.c @@ -20,8 +20,8 @@ * Wrapper between 'ED_undo.h' and 'BKE_undo_system.h' API's. */ -#include "BLI_utildefines.h" #include "BLI_sys_types.h" +#include "BLI_utildefines.h" #include "BLI_ghash.h" diff --git a/source/blender/editors/util/ed_transverts.c b/source/blender/editors/util/ed_transverts.c index f054d09094d..67a62473dc0 100644 --- a/source/blender/editors/util/ed_transverts.c +++ b/source/blender/editors/util/ed_transverts.c @@ -27,18 +27,18 @@ #include "DNA_curve_types.h" #include "DNA_lattice_types.h" #include "DNA_meta_types.h" -#include "DNA_scene_types.h" #include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_math.h" +#include "BLI_utildefines.h" -#include "BKE_curve.h" -#include "BKE_lattice.h" -#include "BKE_editmesh.h" #include "BKE_DerivedMesh.h" #include "BKE_context.h" +#include "BKE_curve.h" +#include "BKE_editmesh.h" +#include "BKE_lattice.h" #include "BKE_mesh_iterators.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/util/ed_util.c b/source/blender/editors/util/ed_util.c index e7d58c8f84b..10b8851f157 100644 --- a/source/blender/editors/util/ed_util.c +++ b/source/blender/editors/util/ed_util.c @@ -21,23 +21,23 @@ * \ingroup edutil */ +#include <math.h> #include <stdlib.h> #include <string.h> -#include <math.h> #include "MEM_guardedalloc.h" #include "DNA_armature_types.h" #include "DNA_mesh_types.h" #include "DNA_object_types.h" +#include "DNA_packedFile_types.h" +#include "DNA_scene_types.h" #include "DNA_screen_types.h" #include "DNA_space_types.h" -#include "DNA_scene_types.h" -#include "DNA_packedFile_types.h" -#include "BLI_utildefines.h" -#include "BLI_string.h" #include "BLI_path_util.h" +#include "BLI_string.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" @@ -45,6 +45,7 @@ #include "BKE_global.h" #include "BKE_layer.h" #include "BKE_main.h" +#include "BKE_material.h" #include "BKE_multires.h" #include "BKE_object.h" #include "BKE_packedFile.h" @@ -52,7 +53,6 @@ #include "BKE_screen.h" #include "BKE_undo_system.h" #include "BKE_workspace.h" -#include "BKE_material.h" #include "DEG_depsgraph.h" @@ -73,9 +73,9 @@ #include "UI_interface.h" #include "UI_resources.h" -#include "WM_types.h" -#include "WM_api.h" #include "RNA_access.h" +#include "WM_api.h" +#include "WM_types.h" /* ********* general editor util funcs, not BKE stuff please! ********* */ diff --git a/source/blender/editors/util/gizmo_utils.c b/source/blender/editors/util/gizmo_utils.c index b856c831424..85a7cc94ae3 100644 --- a/source/blender/editors/util/gizmo_utils.c +++ b/source/blender/editors/util/gizmo_utils.c @@ -28,9 +28,9 @@ #include "DNA_workspace_types.h" -#include "WM_types.h" #include "WM_api.h" #include "WM_toolsystem.h" +#include "WM_types.h" #include "ED_gizmo_utils.h" diff --git a/source/blender/editors/util/numinput.c b/source/blender/editors/util/numinput.c index 88b1bbe3f4b..3c0d0beebe3 100644 --- a/source/blender/editors/util/numinput.c +++ b/source/blender/editors/util/numinput.c @@ -20,11 +20,11 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_math.h" #include "BLI_string.h" -#include "BLI_string_utf8.h" #include "BLI_string_cursor_utf8.h" +#include "BLI_string_utf8.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_scene.h" diff --git a/source/blender/editors/util/select_utils.c b/source/blender/editors/util/select_utils.c index a26579b0d84..85f48e6d397 100644 --- a/source/blender/editors/util/select_utils.c +++ b/source/blender/editors/util/select_utils.c @@ -18,9 +18,9 @@ * \ingroup edutil */ -#include "BLI_utildefines.h" #include "BLI_kdtree.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "ED_select_utils.h" diff --git a/source/blender/editors/uvedit/uvedit_buttons.c b/source/blender/editors/uvedit/uvedit_buttons.c index 44bffc76859..887ce274680 100644 --- a/source/blender/editors/uvedit/uvedit_buttons.c +++ b/source/blender/editors/uvedit/uvedit_buttons.c @@ -21,8 +21,8 @@ * \ingroup eduv */ -#include <string.h> #include <stdio.h> +#include <string.h> #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/uvedit/uvedit_draw.c b/source/blender/editors/uvedit/uvedit_draw.c index d9345808d28..e3504e20464 100644 --- a/source/blender/editors/uvedit/uvedit_draw.c +++ b/source/blender/editors/uvedit/uvedit_draw.c @@ -43,8 +43,8 @@ #include "BKE_deform.h" #include "BKE_editmesh.h" -#include "BKE_material.h" #include "BKE_layer.h" +#include "BKE_material.h" #include "BKE_scene.h" @@ -61,8 +61,8 @@ #include "ED_mesh.h" #include "ED_uvedit.h" -#include "UI_resources.h" #include "UI_interface.h" +#include "UI_resources.h" #include "UI_view2d.h" #include "uvedit_intern.h" diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index 4623cc61d29..b805681cfd3 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -21,32 +21,31 @@ * \ingroup eduv */ -#include <stdlib.h> -#include <string.h> #include <math.h> +#include <stdlib.h> #include <string.h> #include "MEM_guardedalloc.h" -#include "DNA_object_types.h" +#include "DNA_image_types.h" #include "DNA_material_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_node_types.h" -#include "DNA_image_types.h" -#include "DNA_space_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" +#include "DNA_space_types.h" -#include "BLI_utildefines.h" #include "BLI_alloca.h" -#include "BLI_math.h" -#include "BLI_lasso_2d.h" -#include "BLI_blenlib.h" #include "BLI_array.h" +#include "BLI_blenlib.h" #include "BLI_hash.h" -#include "BLI_kdtree.h" #include "BLI_kdopbvh.h" +#include "BLI_kdtree.h" +#include "BLI_lasso_2d.h" +#include "BLI_math.h" #include "BLI_polyfill_2d.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" @@ -69,19 +68,19 @@ #include "ED_image.h" #include "ED_mesh.h" #include "ED_node.h" -#include "ED_uvedit.h" #include "ED_object.h" #include "ED_screen.h" #include "ED_select_utils.h" #include "ED_transform.h" +#include "ED_uvedit.h" #include "RNA_access.h" #include "RNA_define.h" #include "RNA_enum_types.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" +#include "WM_types.h" #include "UI_interface.h" #include "UI_resources.h" diff --git a/source/blender/editors/uvedit/uvedit_parametrizer.c b/source/blender/editors/uvedit/uvedit_parametrizer.c index 91e8c36ea35..5a36c83b62e 100644 --- a/source/blender/editors/uvedit/uvedit_parametrizer.c +++ b/source/blender/editors/uvedit/uvedit_parametrizer.c @@ -20,21 +20,21 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" -#include "BLI_memarena.h" -#include "BLI_math.h" -#include "BLI_rand.h" -#include "BLI_heap.h" #include "BLI_boxpack_2d.h" #include "BLI_convexhull_2d.h" +#include "BLI_heap.h" +#include "BLI_math.h" +#include "BLI_memarena.h" #include "BLI_polyfill_2d.h" #include "BLI_polyfill_2d_beautify.h" +#include "BLI_rand.h" +#include "BLI_utildefines.h" #include "uvedit_parametrizer.h" #include <math.h> -#include <stdlib.h> #include <stdio.h> +#include <stdlib.h> #include <string.h> #include "BLI_sys_types.h" /* for intptr_t support */ diff --git a/source/blender/editors/uvedit/uvedit_smart_stitch.c b/source/blender/editors/uvedit/uvedit_smart_stitch.c index d6652aca216..cf23cac38a7 100644 --- a/source/blender/editors/uvedit/uvedit_smart_stitch.c +++ b/source/blender/editors/uvedit/uvedit_smart_stitch.c @@ -21,38 +21,38 @@ * \ingroup eduv */ +#include <math.h> #include <stdlib.h> #include <string.h> -#include <math.h> #include "MEM_guardedalloc.h" -#include "DNA_object_types.h" #include "DNA_meshdata_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_math.h" #include "BLI_math_vector.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" #include "BKE_context.h" #include "BKE_customdata.h" -#include "BKE_mesh_mapping.h" #include "BKE_editmesh.h" #include "BKE_layer.h" +#include "BKE_mesh_mapping.h" #include "DEG_depsgraph.h" #include "UI_interface.h" #include "ED_mesh.h" -#include "ED_uvedit.h" #include "ED_screen.h" #include "ED_space_api.h" +#include "ED_uvedit.h" #include "GPU_batch.h" #include "GPU_state.h" @@ -63,8 +63,8 @@ #include "WM_api.h" #include "WM_types.h" -#include "UI_view2d.h" #include "UI_resources.h" +#include "UI_view2d.h" #include "uvedit_intern.h" diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.c b/source/blender/editors/uvedit/uvedit_unwrap_ops.c index 7f42eeb5dd7..84d38a88902 100644 --- a/source/blender/editors/uvedit/uvedit_unwrap_ops.c +++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.c @@ -21,40 +21,40 @@ * \ingroup eduv */ -#include <string.h> -#include <stdlib.h> #include <math.h> +#include <stdlib.h> +#include <string.h> #include "MEM_guardedalloc.h" #include "DNA_camera_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_modifier_types.h" -#include "BLI_utildefines.h" #include "BLI_alloca.h" #include "BLI_math.h" -#include "BLI_uvproject.h" #include "BLI_string.h" +#include "BLI_utildefines.h" +#include "BLI_uvproject.h" #include "BLT_translation.h" #include "BKE_cdderivedmesh.h" -#include "BKE_subsurf.h" #include "BKE_context.h" #include "BKE_customdata.h" +#include "BKE_editmesh.h" #include "BKE_image.h" +#include "BKE_layer.h" +#include "BKE_lib_id.h" #include "BKE_main.h" #include "BKE_material.h" +#include "BKE_mesh.h" #include "BKE_report.h" #include "BKE_scene.h" -#include "BKE_editmesh.h" -#include "BKE_layer.h" -#include "BKE_lib_id.h" -#include "BKE_mesh.h" +#include "BKE_subsurf.h" #include "DEG_depsgraph.h" |