diff options
Diffstat (limited to 'source/blender/windowmanager')
40 files changed, 137 insertions, 137 deletions
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h index 7426d64c769..a29ee4131cb 100644 --- a/source/blender/windowmanager/WM_api.h +++ b/source/blender/windowmanager/WM_api.h @@ -31,9 +31,9 @@ */ /* dna-savable wmStructs here */ +#include "BLI_compiler_attrs.h" #include "DNA_windowmanager_types.h" #include "WM_keymap.h" -#include "BLI_compiler_attrs.h" #ifdef __cplusplus extern "C" { diff --git a/source/blender/windowmanager/WM_keymap.h b/source/blender/windowmanager/WM_keymap.h index 1d8e6bb8772..2cf71dcf165 100644 --- a/source/blender/windowmanager/WM_keymap.h +++ b/source/blender/windowmanager/WM_keymap.h @@ -25,8 +25,8 @@ */ /* dna-savable wmStructs here */ -#include "DNA_windowmanager_types.h" #include "BLI_utildefines.h" +#include "DNA_windowmanager_types.h" #ifdef __cplusplus extern "C" { diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h index 1edfe252cf4..f27f3ccf71c 100644 --- a/source/blender/windowmanager/WM_types.h +++ b/source/blender/windowmanager/WM_types.h @@ -120,15 +120,15 @@ struct wmEvent; struct wmOperator; struct wmWindowManager; -#include "RNA_types.h" +#include "BLI_compiler_attrs.h" #include "DNA_listBase.h" #include "DNA_vec_types.h" -#include "BLI_compiler_attrs.h" +#include "RNA_types.h" /* exported types for WM */ +#include "gizmo/WM_gizmo_types.h" #include "wm_cursors.h" #include "wm_event_types.h" -#include "gizmo/WM_gizmo_types.h" /* Include external gizmo API's */ #include "gizmo/WM_gizmo_api.h" diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo.c index e2fb4dc3e0e..df571e84d31 100644 --- a/source/blender/windowmanager/gizmo/intern/wm_gizmo.c +++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo.c @@ -35,8 +35,8 @@ #include "RNA_define.h" #include "BKE_global.h" -#include "BKE_main.h" #include "BKE_idprop.h" +#include "BKE_main.h" #include "WM_api.h" #include "WM_toolsystem.h" @@ -55,8 +55,8 @@ #include "wm.h" /* own includes */ -#include "wm_gizmo_wmapi.h" #include "wm_gizmo_intern.h" +#include "wm_gizmo_wmapi.h" static void wm_gizmo_register(wmGizmoGroup *gzgroup, wmGizmo *gz); diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c index 066aae9071c..ef270533855 100644 --- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c +++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c @@ -52,8 +52,8 @@ #include "ED_undo.h" /* own includes */ -#include "wm_gizmo_wmapi.h" #include "wm_gizmo_intern.h" +#include "wm_gizmo_wmapi.h" #ifdef WITH_PYTHON # include "BPY_extern.h" diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_group_type.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group_type.c index dcc70222a48..560d73ec220 100644 --- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_group_type.c +++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group_type.c @@ -18,8 +18,8 @@ * \ingroup wm */ -#include "BLI_utildefines.h" #include "BLI_ghash.h" +#include "BLI_utildefines.h" #include "BKE_context.h" @@ -35,8 +35,8 @@ #include "wm.h" /* own includes */ -#include "wm_gizmo_wmapi.h" #include "wm_gizmo_intern.h" +#include "wm_gizmo_wmapi.h" /** \name GizmoGroup Type Append * diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c index d463f1df2e9..286afe42158 100644 --- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c +++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c @@ -24,11 +24,11 @@ #include <string.h> #include "BLI_buffer.h" +#include "BLI_ghash.h" #include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_math_bits.h" #include "BLI_rect.h" -#include "BLI_ghash.h" #include "BKE_context.h" #include "BKE_global.h" @@ -55,8 +55,8 @@ #include "DEG_depsgraph.h" /* own includes */ -#include "wm_gizmo_wmapi.h" #include "wm_gizmo_intern.h" +#include "wm_gizmo_wmapi.h" /** * Store all gizmo-maps here. Anyone who wants to register a gizmo for a certain diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_target_props.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo_target_props.c index 469d24c109d..2dc03d1419c 100644 --- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_target_props.c +++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_target_props.c @@ -28,8 +28,8 @@ #include "RNA_access.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" +#include "WM_types.h" #include "wm.h" @@ -38,8 +38,8 @@ #include "ED_view3d.h" /* own includes */ -#include "wm_gizmo_wmapi.h" #include "wm_gizmo_intern.h" +#include "wm_gizmo_wmapi.h" /* -------------------------------------------------------------------- */ /** \name Property Definition diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_type.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo_type.c index 812dd8edd3c..93f3a04978f 100644 --- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_type.c +++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_type.c @@ -18,9 +18,9 @@ * \ingroup wm */ -#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_listbase.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_main.h" @@ -42,8 +42,8 @@ #include "wm.h" /* own includes */ -#include "wm_gizmo_wmapi.h" #include "wm_gizmo_intern.h" +#include "wm_gizmo_wmapi.h" /** \name Gizmo Type Append * diff --git a/source/blender/windowmanager/intern/wm.c b/source/blender/windowmanager/intern/wm.c index 2a4ba7fdb8e..e9d2ee9c662 100644 --- a/source/blender/windowmanager/intern/wm.c +++ b/source/blender/windowmanager/intern/wm.c @@ -25,8 +25,8 @@ * Also Blenders main event loop (WM_main) */ -#include <string.h> #include <stddef.h> +#include <string.h> #include "BLI_sys_types.h" @@ -34,8 +34,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_blenlib.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" @@ -49,15 +49,15 @@ #include "BKE_workspace.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" -#include "wm_window.h" -#include "wm_event_system.h" -#include "wm_draw.h" +#include "WM_types.h" #include "wm.h" +#include "wm_draw.h" +#include "wm_event_system.h" +#include "wm_window.h" -#include "ED_screen.h" #include "BKE_undo_system.h" +#include "ED_screen.h" #ifdef WITH_PYTHON # include "BPY_extern.h" diff --git a/source/blender/windowmanager/intern/wm_cursors.c b/source/blender/windowmanager/intern/wm_cursors.c index 06a6a9d039a..aa80064fae7 100644 --- a/source/blender/windowmanager/intern/wm_cursors.c +++ b/source/blender/windowmanager/intern/wm_cursors.c @@ -40,8 +40,8 @@ #include "BKE_global.h" #include "BKE_main.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" #include "wm_cursors.h" #include "wm_window.h" diff --git a/source/blender/windowmanager/intern/wm_dragdrop.c b/source/blender/windowmanager/intern/wm_dragdrop.c index a45c8af0b5a..728bd7d1227 100644 --- a/source/blender/windowmanager/intern/wm_dragdrop.c +++ b/source/blender/windowmanager/intern/wm_dragdrop.c @@ -25,8 +25,8 @@ #include <string.h> -#include "DNA_windowmanager_types.h" #include "DNA_screen_types.h" +#include "DNA_windowmanager_types.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/windowmanager/intern/wm_draw.c b/source/blender/windowmanager/intern/wm_draw.c index 38cd667c422..b1cfb155df0 100644 --- a/source/blender/windowmanager/intern/wm_draw.c +++ b/source/blender/windowmanager/intern/wm_draw.c @@ -26,13 +26,13 @@ #include <stdlib.h> #include <string.h> +#include "DNA_camera_types.h" #include "DNA_listBase.h" #include "DNA_object_types.h" -#include "DNA_camera_types.h" #include "DNA_screen_types.h" -#include "DNA_windowmanager_types.h" #include "DNA_userdef_types.h" #include "DNA_view3d_types.h" +#include "DNA_windowmanager_types.h" #include "MEM_guardedalloc.h" @@ -42,14 +42,14 @@ #include "BKE_context.h" #include "BKE_image.h" #include "BKE_main.h" -#include "BKE_screen.h" #include "BKE_scene.h" +#include "BKE_screen.h" #include "GHOST_C-api.h" #include "ED_node.h" -#include "ED_view3d.h" #include "ED_screen.h" +#include "ED_view3d.h" #include "GPU_draw.h" #include "GPU_framebuffer.h" @@ -61,13 +61,13 @@ #include "RE_engine.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_toolsystem.h" +#include "WM_types.h" #include "wm.h" #include "wm_draw.h" -#include "wm_window.h" #include "wm_event_system.h" #include "wm_surface.h" +#include "wm_window.h" #ifdef WITH_OPENSUBDIV # include "BKE_subsurf.h" diff --git a/source/blender/windowmanager/intern/wm_event_query.c b/source/blender/windowmanager/intern/wm_event_query.c index eaddbb25034..5b1c7680adc 100644 --- a/source/blender/windowmanager/intern/wm_event_query.c +++ b/source/blender/windowmanager/intern/wm_event_query.c @@ -27,14 +27,14 @@ #include <string.h> #include "DNA_listBase.h" -#include "DNA_screen_types.h" #include "DNA_scene_types.h" -#include "DNA_windowmanager_types.h" +#include "DNA_screen_types.h" #include "DNA_userdef_types.h" +#include "DNA_windowmanager_types.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "BKE_context.h" diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index c14ae57d4a3..6f133e063f7 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -29,10 +29,10 @@ #include <string.h> #include "DNA_listBase.h" -#include "DNA_screen_types.h" #include "DNA_scene_types.h" -#include "DNA_windowmanager_types.h" +#include "DNA_screen_types.h" #include "DNA_userdef_types.h" +#include "DNA_windowmanager_types.h" #include "MEM_guardedalloc.h" @@ -42,14 +42,14 @@ #include "BLI_blenlib.h" #include "BLI_dynstr.h" -#include "BLI_utildefines.h" #include "BLI_math.h" #include "BLI_timer.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_customdata.h" -#include "BKE_idprop.h" #include "BKE_global.h" +#include "BKE_idprop.h" #include "BKE_main.h" #include "BKE_report.h" #include "BKE_scene.h" @@ -63,9 +63,9 @@ #include "ED_fileselect.h" #include "ED_info.h" #include "ED_screen.h" -#include "ED_view3d.h" -#include "ED_util.h" #include "ED_undo.h" +#include "ED_util.h" +#include "ED_view3d.h" #include "RNA_access.h" @@ -74,14 +74,14 @@ #include "PIL_time.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 "wm_window.h" #include "wm_event_system.h" #include "wm_event_types.h" +#include "wm_window.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index bfe36a8ab55..3f4d082f9f7 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -27,9 +27,9 @@ /* placed up here because of crappy * winsock stuff. */ +#include <errno.h> #include <stddef.h> #include <string.h> -#include <errno.h> #include "zlib.h" /* wm_read_exotic() */ @@ -42,19 +42,19 @@ # endif /* 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 "MEM_guardedalloc.h" #include "MEM_CacheLimiterC-Api.h" +#include "MEM_guardedalloc.h" #include "BLI_blenlib.h" #include "BLI_linklist.h" -#include "BLI_utildefines.h" -#include "BLI_timer.h" -#include "BLI_threads.h" #include "BLI_system.h" +#include "BLI_threads.h" +#include "BLI_timer.h" +#include "BLI_utildefines.h" #include BLI_SYSTEM_PID_H #include "BLT_translation.h" @@ -62,10 +62,10 @@ #include "BLF_api.h" #include "DNA_object_types.h" -#include "DNA_space_types.h" -#include "DNA_userdef_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" +#include "DNA_space_types.h" +#include "DNA_userdef_types.h" #include "DNA_windowmanager_types.h" #include "DNA_workspace_types.h" @@ -82,15 +82,15 @@ #include "BKE_main.h" #include "BKE_packedFile.h" #include "BKE_report.h" -#include "BKE_sound.h" #include "BKE_scene.h" #include "BKE_screen.h" +#include "BKE_sound.h" #include "BKE_undo_system.h" #include "BKE_workspace.h" #include "BLO_readfile.h" -#include "BLO_writefile.h" #include "BLO_undofile.h" /* to save from an undo memfile */ +#include "BLO_writefile.h" #include "RNA_access.h" #include "RNA_define.h" @@ -104,10 +104,10 @@ #include "ED_image.h" #include "ED_outliner.h" #include "ED_screen.h" +#include "ED_undo.h" +#include "ED_util.h" #include "ED_view3d.h" #include "ED_view3d_offscreen.h" -#include "ED_util.h" -#include "ED_undo.h" #include "GHOST_C-api.h" #include "GHOST_Path-api.h" @@ -127,14 +127,14 @@ #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 "wm_event_system.h" #include "wm_files.h" #include "wm_window.h" -#include "wm_event_system.h" static RecentFile *wm_file_history_find(const char *filepath); static void wm_history_file_free(RecentFile *recent); diff --git a/source/blender/windowmanager/intern/wm_files_link.c b/source/blender/windowmanager/intern/wm_files_link.c index 73c7a6209ee..58eb194c7f7 100644 --- a/source/blender/windowmanager/intern/wm_files_link.c +++ b/source/blender/windowmanager/intern/wm_files_link.c @@ -23,28 +23,28 @@ * Functions for dealing with append/link operators and helpers. */ -#include <float.h> -#include <string.h> -#include <ctype.h> -#include <stdio.h> -#include <stddef.h> #include <assert.h> +#include <ctype.h> #include <errno.h> +#include <float.h> +#include <stddef.h> +#include <stdio.h> +#include <string.h> #include "MEM_guardedalloc.h" #include "DNA_ID.h" -#include "DNA_screen_types.h" #include "DNA_scene_types.h" +#include "DNA_screen_types.h" #include "DNA_windowmanager_types.h" -#include "BLI_blenlib.h" #include "BLI_bitmap.h" +#include "BLI_blenlib.h" +#include "BLI_ghash.h" #include "BLI_linklist.h" #include "BLI_math.h" #include "BLI_memarena.h" #include "BLI_utildefines.h" -#include "BLI_ghash.h" #include "BLO_readfile.h" diff --git a/source/blender/windowmanager/intern/wm_gesture.c b/source/blender/windowmanager/intern/wm_gesture.c index ffb37544e49..71ae44297e7 100644 --- a/source/blender/windowmanager/intern/wm_gesture.c +++ b/source/blender/windowmanager/intern/wm_gesture.c @@ -24,17 +24,17 @@ */ #include "DNA_screen_types.h" -#include "DNA_vec_types.h" #include "DNA_userdef_types.h" +#include "DNA_vec_types.h" #include "DNA_windowmanager_types.h" #include "MEM_guardedalloc.h" #include "BLI_bitmap_draw_2d.h" #include "BLI_blenlib.h" +#include "BLI_lasso_2d.h" #include "BLI_math.h" #include "BLI_utildefines.h" -#include "BLI_lasso_2d.h" #include "BKE_context.h" diff --git a/source/blender/windowmanager/intern/wm_gesture_ops.c b/source/blender/windowmanager/intern/wm_gesture_ops.c index 341bd4a16f7..11beb7d2fd5 100644 --- a/source/blender/windowmanager/intern/wm_gesture_ops.c +++ b/source/blender/windowmanager/intern/wm_gesture_ops.c @@ -35,12 +35,12 @@ #include "BKE_context.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" #include "wm.h" -#include "wm_event_types.h" #include "wm_event_system.h" +#include "wm_event_types.h" #include "ED_screen.h" #include "ED_select_utils.h" diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index 7b04b40e626..fda0cb70c5b 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -23,8 +23,8 @@ * Manage initializing resources and correctly shutting down. */ -#include <stdlib.h> #include <stdio.h> +#include <stdlib.h> #include <string.h> #ifdef _WIN32 @@ -45,36 +45,36 @@ #include "BLI_path_util.h" #include "BLI_string.h" #include "BLI_threads.h" -#include "BLI_utildefines.h" #include "BLI_timer.h" +#include "BLI_utildefines.h" -#include "BLO_writefile.h" #include "BLO_undofile.h" +#include "BLO_writefile.h" -#include "BKE_blendfile.h" #include "BKE_blender.h" +#include "BKE_blendfile.h" #include "BKE_callbacks.h" #include "BKE_context.h" #include "BKE_font.h" #include "BKE_global.h" #include "BKE_icons.h" +#include "BKE_keyconfig.h" #include "BKE_lib_remap.h" #include "BKE_main.h" #include "BKE_mball_tessellate.h" #include "BKE_node.h" #include "BKE_report.h" -#include "BKE_screen.h" #include "BKE_scene.h" +#include "BKE_screen.h" #include "BKE_sound.h" -#include "BKE_keyconfig.h" #include "BKE_addon.h" #include "BKE_appdir.h" +#include "BKE_mask.h" /* free mask clipboard */ +#include "BKE_material.h" /* BKE_material_copybuf_clear */ #include "BKE_sequencer.h" /* free seq clipboard */ #include "BKE_studiolight.h" -#include "BKE_material.h" /* BKE_material_copybuf_clear */ #include "BKE_tracking.h" /* free tracking clipboard */ -#include "BKE_mask.h" /* free mask clipboard */ #include "RE_engine.h" #include "RE_pipeline.h" /* RE_ free stuff */ @@ -85,43 +85,43 @@ # include "BPY_extern.h" #endif -#include "GHOST_Path-api.h" #include "GHOST_C-api.h" +#include "GHOST_Path-api.h" #include "RNA_define.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" +#include "WM_types.h" +#include "wm.h" #include "wm_cursors.h" #include "wm_event_system.h" -#include "wm.h" #include "wm_files.h" +#include "wm_platform_support.h" #include "wm_surface.h" #include "wm_window.h" -#include "wm_platform_support.h" #include "ED_anim_api.h" #include "ED_armature.h" #include "ED_gpencil.h" -#include "ED_keyframing.h" #include "ED_keyframes_edit.h" +#include "ED_keyframing.h" #include "ED_node.h" #include "ED_render.h" -#include "ED_space_api.h" #include "ED_screen.h" -#include "ED_util.h" +#include "ED_space_api.h" #include "ED_undo.h" +#include "ED_util.h" -#include "UI_interface.h" -#include "UI_resources.h" #include "BLF_api.h" #include "BLT_lang.h" +#include "UI_interface.h" +#include "UI_resources.h" -#include "GPU_material.h" #include "GPU_draw.h" #include "GPU_init_exit.h" +#include "GPU_material.h" #include "BKE_sound.h" #include "COM_compositor.h" diff --git a/source/blender/windowmanager/intern/wm_jobs.c b/source/blender/windowmanager/intern/wm_jobs.c index 9dedab8cc55..33ea6dc54cc 100644 --- a/source/blender/windowmanager/intern/wm_jobs.c +++ b/source/blender/windowmanager/intern/wm_jobs.c @@ -38,8 +38,8 @@ #include "WM_api.h" #include "WM_types.h" -#include "wm_event_types.h" #include "wm.h" +#include "wm_event_types.h" #include "PIL_time.h" diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c index a8c52aa1314..c1a4595ec6b 100644 --- a/source/blender/windowmanager/intern/wm_keymap.c +++ b/source/blender/windowmanager/intern/wm_keymap.c @@ -32,18 +32,18 @@ #include "DNA_windowmanager_types.h" #include "DNA_workspace_types.h" -#include "MEM_guardedalloc.h" #include "CLG_log.h" +#include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "BLF_api.h" #include "BKE_context.h" -#include "BKE_idprop.h" #include "BKE_global.h" +#include "BKE_idprop.h" #include "BKE_main.h" #include "BKE_screen.h" #include "BKE_workspace.h" diff --git a/source/blender/windowmanager/intern/wm_menu_type.c b/source/blender/windowmanager/intern/wm_menu_type.c index f657eb951bf..28dd1984bf0 100644 --- a/source/blender/windowmanager/intern/wm_menu_type.c +++ b/source/blender/windowmanager/intern/wm_menu_type.c @@ -27,8 +27,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_screen.h" diff --git a/source/blender/windowmanager/intern/wm_operator_props.c b/source/blender/windowmanager/intern/wm_operator_props.c index e11d636ffc9..93cd757ea93 100644 --- a/source/blender/windowmanager/intern/wm_operator_props.c +++ b/source/blender/windowmanager/intern/wm_operator_props.c @@ -26,8 +26,8 @@ #include "DNA_space_types.h" -#include "BLI_rect.h" #include "BLI_math_base.h" +#include "BLI_rect.h" #include "UI_resources.h" diff --git a/source/blender/windowmanager/intern/wm_operator_type.c b/source/blender/windowmanager/intern/wm_operator_type.c index 7244b0a0d9a..015f2b0448d 100644 --- a/source/blender/windowmanager/intern/wm_operator_type.c +++ b/source/blender/windowmanager/intern/wm_operator_type.c @@ -25,16 +25,16 @@ #include "CLG_log.h" #include "DNA_ID.h" -#include "DNA_screen_types.h" #include "DNA_scene_types.h" +#include "DNA_screen_types.h" #include "DNA_userdef_types.h" #include "DNA_windowmanager_types.h" #include "BLT_translation.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_idprop.h" diff --git a/source/blender/windowmanager/intern/wm_operator_utils.c b/source/blender/windowmanager/intern/wm_operator_utils.c index c3dab133e44..4a786329e1a 100644 --- a/source/blender/windowmanager/intern/wm_operator_utils.c +++ b/source/blender/windowmanager/intern/wm_operator_utils.c @@ -22,8 +22,8 @@ #include <math.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/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index b67d05d8b7a..625e7878b07 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -24,13 +24,13 @@ * as well as some generic operators and shared operator properties. */ -#include <float.h> -#include <string.h> -#include <ctype.h> -#include <stdio.h> -#include <stddef.h> #include <assert.h> +#include <ctype.h> #include <errno.h> +#include <float.h> +#include <stddef.h> +#include <stdio.h> +#include <string.h> #ifdef WIN32 # include "GHOST_C-api.h" @@ -43,8 +43,8 @@ #include "DNA_ID.h" #include "DNA_brush_types.h" #include "DNA_object_types.h" -#include "DNA_screen_types.h" #include "DNA_scene_types.h" +#include "DNA_screen_types.h" #include "DNA_userdef_types.h" #include "DNA_windowmanager_types.h" diff --git a/source/blender/windowmanager/intern/wm_panel_type.c b/source/blender/windowmanager/intern/wm_panel_type.c index 4324ae03b2c..1d2fecd0de6 100644 --- a/source/blender/windowmanager/intern/wm_panel_type.c +++ b/source/blender/windowmanager/intern/wm_panel_type.c @@ -30,8 +30,8 @@ #include "DNA_windowmanager_types.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" +#include "BLI_utildefines.h" #include "BKE_screen.h" diff --git a/source/blender/windowmanager/intern/wm_platform_support.c b/source/blender/windowmanager/intern/wm_platform_support.c index 73ba4b550c9..65e1cd45e02 100644 --- a/source/blender/windowmanager/intern/wm_platform_support.c +++ b/source/blender/windowmanager/intern/wm_platform_support.c @@ -25,12 +25,12 @@ #include <string.h> -#include "BLI_sys_types.h" #include "BLI_dynstr.h" -#include "BLI_path_util.h" #include "BLI_fileops.h" -#include "BLI_string.h" #include "BLI_linklist.h" +#include "BLI_path_util.h" +#include "BLI_string.h" +#include "BLI_sys_types.h" #include "BLT_translation.h" diff --git a/source/blender/windowmanager/intern/wm_playanim.c b/source/blender/windowmanager/intern/wm_playanim.c index ac5fd522664..c6eb1393ffe 100644 --- a/source/blender/windowmanager/intern/wm_playanim.c +++ b/source/blender/windowmanager/intern/wm_playanim.c @@ -27,16 +27,16 @@ * this could be made into its own module, alongside creator. */ -#include <sys/types.h> #include <fcntl.h> +#include <math.h> #include <stdlib.h> #include <string.h> -#include <math.h> +#include <sys/types.h> #ifndef WIN32 -# include <unistd.h> # include <sys/times.h> # include <sys/wait.h> +# include <unistd.h> #else # include <io.h> #endif @@ -44,30 +44,30 @@ #include "PIL_time.h" -#include "BLI_utildefines.h" #include "BLI_fileops.h" #include "BLI_listbase.h" #include "BLI_path_util.h" #include "BLI_string.h" +#include "BLI_utildefines.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "BKE_image.h" #include "BIF_glutil.h" #include "GPU_context.h" -#include "GPU_matrix.h" #include "GPU_immediate.h" #include "GPU_immediate_util.h" #include "GPU_init_exit.h" +#include "GPU_matrix.h" #include "GPU_state.h" +#include "BLF_api.h" #include "DNA_scene_types.h" #include "ED_datafiles.h" /* for fonts */ #include "GHOST_C-api.h" -#include "BLF_api.h" #include "DEG_depsgraph.h" diff --git a/source/blender/windowmanager/intern/wm_splash_screen.c b/source/blender/windowmanager/intern/wm_splash_screen.c index dcf09e9cbc5..9c7ed52b0f9 100644 --- a/source/blender/windowmanager/intern/wm_splash_screen.c +++ b/source/blender/windowmanager/intern/wm_splash_screen.c @@ -34,8 +34,8 @@ #include "CLG_log.h" #include "DNA_ID.h" -#include "DNA_screen_types.h" #include "DNA_scene_types.h" +#include "DNA_screen_types.h" #include "DNA_userdef_types.h" #include "DNA_windowmanager_types.h" @@ -49,8 +49,8 @@ #include "BLF_api.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "ED_screen.h" diff --git a/source/blender/windowmanager/intern/wm_surface.c b/source/blender/windowmanager/intern/wm_surface.c index cb575cc8f7d..043b584bbbd 100644 --- a/source/blender/windowmanager/intern/wm_surface.c +++ b/source/blender/windowmanager/intern/wm_surface.c @@ -28,14 +28,14 @@ #include "GHOST_C-api.h" #include "GPU_batch_presets.h" +#include "GPU_context.h" #include "GPU_framebuffer.h" #include "GPU_immediate.h" -#include "GPU_context.h" #include "MEM_guardedalloc.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" #include "wm.h" #include "wm_surface.h" diff --git a/source/blender/windowmanager/intern/wm_toolsystem.c b/source/blender/windowmanager/intern/wm_toolsystem.c index e721fd21b88..4cfd1d1e0c0 100644 --- a/source/blender/windowmanager/intern/wm_toolsystem.c +++ b/source/blender/windowmanager/intern/wm_toolsystem.c @@ -26,16 +26,16 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" -#include "BLI_string.h" #include "BLI_listbase.h" +#include "BLI_string.h" +#include "BLI_utildefines.h" #include "DNA_ID.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_space_types.h" #include "DNA_windowmanager_types.h" #include "DNA_workspace_types.h" -#include "DNA_object_types.h" #include "BKE_brush.h" #include "BKE_context.h" @@ -49,9 +49,9 @@ #include "RNA_enum_types.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" #include "WM_toolsystem.h" /* own include */ +#include "WM_types.h" static void toolsystem_reinit_with_toolref(bContext *C, WorkSpace *UNUSED(workspace), diff --git a/source/blender/windowmanager/intern/wm_uilist_type.c b/source/blender/windowmanager/intern/wm_uilist_type.c index e79f18eed6f..f886e01f5a3 100644 --- a/source/blender/windowmanager/intern/wm_uilist_type.c +++ b/source/blender/windowmanager/intern/wm_uilist_type.c @@ -26,8 +26,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" +#include "BLI_utildefines.h" #include "BKE_screen.h" diff --git a/source/blender/windowmanager/intern/wm_utils.c b/source/blender/windowmanager/intern/wm_utils.c index b227065e3cf..163ab257beb 100644 --- a/source/blender/windowmanager/intern/wm_utils.c +++ b/source/blender/windowmanager/intern/wm_utils.c @@ -20,8 +20,8 @@ * Generic helper utilities that aren't associated with a particular area. */ -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index eaa0fa7b7a5..a3e1814f8d2 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -25,8 +25,8 @@ */ #include <math.h> -#include <stdlib.h> #include <stdio.h> +#include <stdlib.h> #include <string.h> #include "DNA_listBase.h" @@ -38,8 +38,8 @@ #include "GHOST_C-api.h" -#include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_math.h" #include "BLI_utildefines.h" #include "BLT_translation.h" @@ -60,32 +60,32 @@ #include "WM_types.h" #include "wm.h" #include "wm_draw.h" +#include "wm_event_system.h" #include "wm_files.h" #include "wm_platform_support.h" #include "wm_window.h" #include "wm_window_private.h" -#include "wm_event_system.h" #include "ED_anim_api.h" +#include "ED_fileselect.h" #include "ED_render.h" #include "ED_scene.h" #include "ED_screen.h" -#include "ED_fileselect.h" #include "UI_interface.h" #include "UI_interface_icons.h" #include "PIL_time.h" +#include "BLF_api.h" #include "GPU_batch.h" #include "GPU_batch_presets.h" +#include "GPU_context.h" #include "GPU_draw.h" -#include "GPU_platform.h" #include "GPU_framebuffer.h" -#include "GPU_init_exit.h" #include "GPU_immediate.h" -#include "GPU_context.h" -#include "BLF_api.h" +#include "GPU_init_exit.h" +#include "GPU_platform.h" #include "UI_resources.h" diff --git a/source/blender/windowmanager/intern/wm_xr.c b/source/blender/windowmanager/intern/wm_xr.c index ef6fa6d28f2..95c0f353298 100644 --- a/source/blender/windowmanager/intern/wm_xr.c +++ b/source/blender/windowmanager/intern/wm_xr.c @@ -58,8 +58,8 @@ #include "UI_interface.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" #include "wm.h" #include "wm_surface.h" diff --git a/source/blender/windowmanager/message_bus/intern/wm_message_bus.c b/source/blender/windowmanager/message_bus/intern/wm_message_bus.c index 2cb8cc40995..fd5237a70a5 100644 --- a/source/blender/windowmanager/message_bus/intern/wm_message_bus.c +++ b/source/blender/windowmanager/message_bus/intern/wm_message_bus.c @@ -24,15 +24,15 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_listbase.h" +#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "WM_types.h" -#include "message_bus/wm_message_bus.h" #include "message_bus/intern/wm_message_bus_intern.h" +#include "message_bus/wm_message_bus.h" /* -------------------------------------------------------------------------- */ /** \name Public API diff --git a/source/blender/windowmanager/message_bus/intern/wm_message_bus_rna.c b/source/blender/windowmanager/message_bus/intern/wm_message_bus_rna.c index 97ca879736e..460dca57e4f 100644 --- a/source/blender/windowmanager/message_bus/intern/wm_message_bus_rna.c +++ b/source/blender/windowmanager/message_bus/intern/wm_message_bus_rna.c @@ -25,12 +25,12 @@ #include "DNA_ID.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_listbase.h" +#include "BLI_utildefines.h" -#include "WM_types.h" #include "WM_message.h" +#include "WM_types.h" #include "message_bus/intern/wm_message_bus_intern.h" #include "RNA_access.h" diff --git a/source/blender/windowmanager/message_bus/intern/wm_message_bus_static.c b/source/blender/windowmanager/message_bus/intern/wm_message_bus_static.c index f3784b35499..c47cec4b3e4 100644 --- a/source/blender/windowmanager/message_bus/intern/wm_message_bus_static.c +++ b/source/blender/windowmanager/message_bus/intern/wm_message_bus_static.c @@ -24,12 +24,12 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_listbase.h" +#include "BLI_utildefines.h" -#include "WM_types.h" #include "WM_message.h" +#include "WM_types.h" #include "message_bus/intern/wm_message_bus_intern.h" /* -------------------------------------------------------------------------- */ |