diff options
Diffstat (limited to 'source/blender/editors/animation')
-rw-r--r-- | source/blender/editors/animation/anim_channels_defines.c | 22 | ||||
-rw-r--r-- | source/blender/editors/animation/anim_channels_edit.c | 16 | ||||
-rw-r--r-- | source/blender/editors/animation/anim_deps.c | 6 | ||||
-rw-r--r-- | source/blender/editors/animation/anim_draw.c | 16 | ||||
-rw-r--r-- | source/blender/editors/animation/anim_filter.c | 26 | ||||
-rw-r--r-- | source/blender/editors/animation/anim_markers.c | 10 | ||||
-rw-r--r-- | source/blender/editors/animation/anim_motion_paths.c | 4 | ||||
-rw-r--r-- | source/blender/editors/animation/anim_ops.c | 6 | ||||
-rw-r--r-- | source/blender/editors/animation/drivers.c | 6 | ||||
-rw-r--r-- | source/blender/editors/animation/keyframes_draw.c | 10 | ||||
-rw-r--r-- | source/blender/editors/animation/keyframes_edit.c | 6 | ||||
-rw-r--r-- | source/blender/editors/animation/keyframes_general.c | 14 | ||||
-rw-r--r-- | source/blender/editors/animation/keyframing.c | 12 | ||||
-rw-r--r-- | source/blender/editors/animation/keyingsets.c | 10 | ||||
-rw-r--r-- | source/blender/editors/animation/time_scrub_ui.c | 4 |
15 files changed, 84 insertions, 84 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" |