diff options
Diffstat (limited to 'source/blender/editors/interface')
34 files changed, 114 insertions, 114 deletions
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 */ |