diff options
Diffstat (limited to 'source/blender/editors')
16 files changed, 104 insertions, 113 deletions
diff --git a/source/blender/editors/manipulator_library/manipulator_draw_utils.c b/source/blender/editors/manipulator_library/manipulator_draw_utils.c index f15cd9c9793..430841311aa 100644 --- a/source/blender/editors/manipulator_library/manipulator_draw_utils.c +++ b/source/blender/editors/manipulator_library/manipulator_draw_utils.c @@ -27,14 +27,14 @@ * \ingroup wm */ -#include "BKE_context.h" - #include "BLI_listbase.h" #include "BLI_ghash.h" #include "BLI_math.h" #include "BLI_string.h" #include "BLI_string_utils.h" +#include "BKE_context.h" + #include "ED_screen.h" #include "ED_view3d.h" diff --git a/source/blender/editors/manipulator_library/manipulator_library_presets.c b/source/blender/editors/manipulator_library/manipulator_library_presets.c index e552a7a6aa3..7b8d2104992 100644 --- a/source/blender/editors/manipulator_library/manipulator_library_presets.c +++ b/source/blender/editors/manipulator_library/manipulator_library_presets.c @@ -26,17 +26,16 @@ * \brief Preset shapes that can be drawn from any manipulator type. */ -#include "BIF_gl.h" - -#include "BKE_context.h" +#include "MEM_guardedalloc.h" #include "BLI_math.h" #include "DNA_view3d_types.h" #include "DNA_object_types.h" -#include "ED_view3d.h" -#include "ED_screen.h" +#include "BKE_context.h" + +#include "BIF_gl.h" #include "GPU_draw.h" #include "GPU_immediate.h" @@ -44,8 +43,6 @@ #include "GPU_matrix.h" #include "GPU_select.h" -#include "MEM_guardedalloc.h" - #include "DEG_depsgraph.h" #include "RNA_access.h" @@ -53,6 +50,8 @@ #include "WM_types.h" #include "WM_api.h" +#include "ED_view3d.h" +#include "ED_screen.h" /* own includes */ #include "ED_manipulator_library.h" /* own include */ diff --git a/source/blender/editors/manipulator_library/manipulator_library_utils.c b/source/blender/editors/manipulator_library/manipulator_library_utils.c index fb1d1f89626..38b518b1992 100644 --- a/source/blender/editors/manipulator_library/manipulator_library_utils.c +++ b/source/blender/editors/manipulator_library/manipulator_library_utils.c @@ -31,21 +31,21 @@ * \brief This file contains functions for common behaviors of manipulators. */ -#include "BKE_context.h" - #include "BLI_math.h" #include "BLI_listbase.h" #include "DNA_view3d_types.h" #include "DNA_screen_types.h" -#include "ED_view3d.h" +#include "BKE_context.h" #include "RNA_access.h" #include "WM_api.h" #include "WM_types.h" +#include "ED_view3d.h" + /* own includes */ #include "manipulator_library_intern.h" diff --git a/source/blender/editors/manipulator_library/manipulator_types/arrow2d_manipulator.c b/source/blender/editors/manipulator_library/manipulator_types/arrow2d_manipulator.c index 44dd5698a48..749e92e25fb 100644 --- a/source/blender/editors/manipulator_library/manipulator_types/arrow2d_manipulator.c +++ b/source/blender/editors/manipulator_library/manipulator_types/arrow2d_manipulator.c @@ -31,18 +31,15 @@ * \brief Simple arrow manipulator which is dragged into a certain direction. */ -#include "BIF_gl.h" - -#include "BKE_context.h" - #include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_rect.h" #include "DNA_windowmanager_types.h" -#include "ED_screen.h" -#include "ED_manipulator_library.h" +#include "BKE_context.h" + +#include "BIF_gl.h" #include "GPU_draw.h" #include "GPU_immediate.h" @@ -55,6 +52,9 @@ #include "WM_types.h" +#include "ED_screen.h" +#include "ED_manipulator_library.h" + /* own includes */ #include "WM_api.h" diff --git a/source/blender/editors/manipulator_library/manipulator_types/arrow3d_manipulator.c b/source/blender/editors/manipulator_library/manipulator_types/arrow3d_manipulator.c index 3bbcafb925a..e9760e3e270 100644 --- a/source/blender/editors/manipulator_library/manipulator_types/arrow3d_manipulator.c +++ b/source/blender/editors/manipulator_library/manipulator_types/arrow3d_manipulator.c @@ -40,15 +40,11 @@ #include "BIF_gl.h" -#include "BKE_context.h" - #include "BLI_math.h" #include "DNA_view3d_types.h" -#include "ED_view3d.h" -#include "ED_screen.h" -#include "ED_manipulator_library.h" +#include "BKE_context.h" #include "GPU_draw.h" #include "GPU_immediate.h" @@ -64,6 +60,10 @@ #include "WM_types.h" #include "WM_api.h" +#include "ED_view3d.h" +#include "ED_screen.h" +#include "ED_manipulator_library.h" + /* own includes */ #include "../manipulator_geometry.h" #include "../manipulator_library_intern.h" diff --git a/source/blender/editors/manipulator_library/manipulator_types/cage2d_manipulator.c b/source/blender/editors/manipulator_library/manipulator_types/cage2d_manipulator.c index d1902864d57..0299a33d0fe 100644 --- a/source/blender/editors/manipulator_library/manipulator_types/cage2d_manipulator.c +++ b/source/blender/editors/manipulator_library/manipulator_types/cage2d_manipulator.c @@ -34,17 +34,15 @@ * Interacting scales or translates the manipulator. */ -#include "BIF_gl.h" - -#include "BKE_context.h" +#include "MEM_guardedalloc.h" #include "BLI_math.h" #include "BLI_dial.h" #include "BLI_rect.h" -#include "ED_screen.h" -#include "ED_view3d.h" -#include "ED_manipulator_library.h" +#include "BKE_context.h" + +#include "BIF_gl.h" #include "GPU_matrix.h" #include "GPU_shader.h" @@ -52,14 +50,16 @@ #include "GPU_immediate_util.h" #include "GPU_select.h" -#include "MEM_guardedalloc.h" - #include "RNA_access.h" #include "RNA_define.h" #include "WM_api.h" #include "WM_types.h" +#include "ED_screen.h" +#include "ED_view3d.h" +#include "ED_manipulator_library.h" + /* own includes */ #include "../manipulator_library_intern.h" diff --git a/source/blender/editors/manipulator_library/manipulator_types/cage3d_manipulator.c b/source/blender/editors/manipulator_library/manipulator_types/cage3d_manipulator.c index e116a26fd59..d58cdb4b187 100644 --- a/source/blender/editors/manipulator_library/manipulator_types/cage3d_manipulator.c +++ b/source/blender/editors/manipulator_library/manipulator_types/cage3d_manipulator.c @@ -34,17 +34,15 @@ * Interacting scales or translates the manipulator. */ -#include "BIF_gl.h" - -#include "BKE_context.h" +#include "MEM_guardedalloc.h" #include "BLI_math.h" #include "BLI_dial.h" #include "BLI_rect.h" -#include "ED_screen.h" -#include "ED_view3d.h" -#include "ED_manipulator_library.h" +#include "BKE_context.h" + +#include "BIF_gl.h" #include "GPU_matrix.h" #include "GPU_shader.h" @@ -52,14 +50,16 @@ #include "GPU_immediate_util.h" #include "GPU_select.h" -#include "MEM_guardedalloc.h" - #include "RNA_access.h" #include "RNA_define.h" #include "WM_api.h" #include "WM_types.h" +#include "ED_screen.h" +#include "ED_view3d.h" +#include "ED_manipulator_library.h" + /* own includes */ #include "../manipulator_library_intern.h" diff --git a/source/blender/editors/manipulator_library/manipulator_types/dial3d_manipulator.c b/source/blender/editors/manipulator_library/manipulator_types/dial3d_manipulator.c index ec490a0d047..f2f5851ff0c 100644 --- a/source/blender/editors/manipulator_library/manipulator_types/dial3d_manipulator.c +++ b/source/blender/editors/manipulator_library/manipulator_types/dial3d_manipulator.c @@ -38,25 +38,19 @@ * - `matrix[2]` is the axis the dial rotates around (all dials). */ -#include "BIF_gl.h" -#include "BIF_glutil.h" - -#include "BKE_context.h" +#include "MEM_guardedalloc.h" #include "BLI_math.h" -#include "ED_screen.h" -#include "ED_view3d.h" -#include "ED_manipulator_library.h" - -#include "GPU_select.h" +#include "BKE_context.h" -#include "GPU_matrix.h" +#include "BIF_gl.h" +#include "BIF_glutil.h" #include "GPU_immediate.h" #include "GPU_immediate_util.h" - -#include "MEM_guardedalloc.h" +#include "GPU_matrix.h" +#include "GPU_select.h" #include "RNA_access.h" #include "RNA_define.h" @@ -64,6 +58,10 @@ #include "WM_api.h" #include "WM_types.h" +#include "ED_screen.h" +#include "ED_view3d.h" +#include "ED_manipulator_library.h" + /* own includes */ #include "../manipulator_geometry.h" #include "../manipulator_library_intern.h" diff --git a/source/blender/editors/manipulator_library/manipulator_types/grab3d_manipulator.c b/source/blender/editors/manipulator_library/manipulator_types/grab3d_manipulator.c index 5353104a1fd..151e173e5e6 100644 --- a/source/blender/editors/manipulator_library/manipulator_types/grab3d_manipulator.c +++ b/source/blender/editors/manipulator_library/manipulator_types/grab3d_manipulator.c @@ -33,25 +33,19 @@ * */ -#include "BIF_gl.h" -#include "BIF_glutil.h" - -#include "BKE_context.h" +#include "MEM_guardedalloc.h" #include "BLI_math.h" -#include "ED_screen.h" -#include "ED_view3d.h" -#include "ED_manipulator_library.h" - -#include "GPU_select.h" +#include "BKE_context.h" -#include "GPU_matrix.h" +#include "BIF_gl.h" +#include "BIF_glutil.h" #include "GPU_immediate.h" #include "GPU_immediate_util.h" - -#include "MEM_guardedalloc.h" +#include "GPU_matrix.h" +#include "GPU_select.h" #include "RNA_access.h" #include "RNA_define.h" @@ -59,6 +53,10 @@ #include "WM_api.h" #include "WM_types.h" +#include "ED_screen.h" +#include "ED_view3d.h" +#include "ED_manipulator_library.h" + /* own includes */ #include "../manipulator_geometry.h" #include "../manipulator_library_intern.h" diff --git a/source/blender/editors/manipulator_library/manipulator_types/primitive3d_manipulator.c b/source/blender/editors/manipulator_library/manipulator_types/primitive3d_manipulator.c index eea14f2033f..531cf742e6f 100644 --- a/source/blender/editors/manipulator_library/manipulator_types/primitive3d_manipulator.c +++ b/source/blender/editors/manipulator_library/manipulator_types/primitive3d_manipulator.c @@ -29,20 +29,20 @@ * Currently only plane primitive supported without own handling, use with operator only. */ -#include "BIF_gl.h" - -#include "BKE_context.h" +#include "MEM_guardedalloc.h" #include "BLI_math.h" #include "DNA_view3d_types.h" +#include "BKE_context.h" + +#include "BIF_gl.h" + #include "GPU_immediate.h" #include "GPU_matrix.h" #include "GPU_select.h" -#include "MEM_guardedalloc.h" - #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/object/object_facemap_ops.c b/source/blender/editors/object/object_facemap_ops.c index d526ea93ffa..857446ac6b0 100644 --- a/source/blender/editors/object/object_facemap_ops.c +++ b/source/blender/editors/object/object_facemap_ops.c @@ -24,13 +24,18 @@ * ***** END GPL LICENSE BLOCK ***** */ +#include <string.h> + +#include "MEM_guardedalloc.h" + +#include "BLI_utildefines.h" +#include "BLI_path_util.h" +#include "BLI_string.h" +#include "BLI_listbase.h" #include "DNA_object_types.h" #include "DNA_mesh_types.h" -#include "WM_types.h" -#include "WM_api.h" - #include "BKE_context.h" #include "BKE_customdata.h" #include "BKE_editmesh.h" @@ -40,21 +45,15 @@ #include "DEG_depsgraph.h" -#include "BLI_utildefines.h" -#include "BLI_path_util.h" -#include "BLI_string.h" -#include "BLI_listbase.h" +#include "RNA_define.h" +#include "RNA_access.h" -#include "MEM_guardedalloc.h" +#include "WM_types.h" +#include "WM_api.h" #include "ED_mesh.h" #include "ED_object.h" -#include "RNA_define.h" -#include "RNA_access.h" - -#include <string.h> - #include "object_intern.h" /* called while not in editmode */ diff --git a/source/blender/editors/screen/workspace_layout_edit.c b/source/blender/editors/screen/workspace_layout_edit.c index e4dd841f833..d84df160125 100644 --- a/source/blender/editors/screen/workspace_layout_edit.c +++ b/source/blender/editors/screen/workspace_layout_edit.c @@ -24,24 +24,23 @@ #include <stdlib.h> -#include "BKE_context.h" -#include "BKE_global.h" -#include "BKE_main.h" -#include "BKE_screen.h" -#include "BKE_workspace.h" - #include "BLI_utildefines.h" #include "BLI_listbase.h" #include "DNA_screen_types.h" #include "DNA_workspace_types.h" -#include "ED_screen.h" +#include "BKE_context.h" +#include "BKE_global.h" +#include "BKE_main.h" +#include "BKE_screen.h" +#include "BKE_workspace.h" #include "WM_api.h" -#include "screen_intern.h" +#include "ED_screen.h" +#include "screen_intern.h" /** * Empty screen, with 1 dummy area without spacedata. Uses window size. diff --git a/source/blender/editors/space_outliner/outliner_ops.c b/source/blender/editors/space_outliner/outliner_ops.c index 6946993d630..aa6a5dba6a7 100644 --- a/source/blender/editors/space_outliner/outliner_ops.c +++ b/source/blender/editors/space_outliner/outliner_ops.c @@ -28,15 +28,13 @@ * \ingroup spoutliner */ -#include "BKE_context.h" -#include "BKE_main.h" +#include "MEM_guardedalloc.h" #include "BLI_listbase.h" #include "BLI_math.h" -#include "ED_screen.h" - -#include "MEM_guardedalloc.h" +#include "BKE_context.h" +#include "BKE_main.h" #include "RNA_access.h" @@ -46,8 +44,9 @@ #include "WM_api.h" #include "WM_types.h" -#include "outliner_intern.h" +#include "ED_screen.h" +#include "outliner_intern.h" enum { OUTLINER_ITEM_DRAG_CANCEL, diff --git a/source/blender/editors/space_outliner/outliner_utils.c b/source/blender/editors/space_outliner/outliner_utils.c index f123b240efc..d3f7fd7055e 100644 --- a/source/blender/editors/space_outliner/outliner_utils.c +++ b/source/blender/editors/space_outliner/outliner_utils.c @@ -27,20 +27,19 @@ * \ingroup spoutliner */ -#include "BKE_outliner_treehash.h" - #include "BLI_utildefines.h" #include "DNA_action_types.h" #include "DNA_space_types.h" +#include "BKE_outliner_treehash.h" + #include "ED_armature.h" #include "UI_interface.h" #include "outliner_intern.h" - /** * Try to find an item under y-coordinate \a view_co_y (view-space). * \note Recursive diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index 1e273462d52..eeca75b7308 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -30,6 +30,13 @@ #include <math.h> +#include "BLI_listbase.h" +#include "BLI_math.h" +#include "BLI_rect.h" +#include "BLI_string.h" +#include "BLI_threads.h" +#include "BLI_jitter.h" + #include "BIF_gl.h" #include "BIF_glutil.h" @@ -44,13 +51,6 @@ #include "BLF_api.h" -#include "BLI_listbase.h" -#include "BLI_math.h" -#include "BLI_rect.h" -#include "BLI_string.h" -#include "BLI_threads.h" -#include "BLI_jitter.h" - #include "BLT_translation.h" #include "DNA_armature_types.h" diff --git a/source/blender/editors/transform/transform_manipulator2d.c b/source/blender/editors/transform/transform_manipulator2d.c index 94f425eb9f0..6e2d0d8c5c0 100644 --- a/source/blender/editors/transform/transform_manipulator2d.c +++ b/source/blender/editors/transform/transform_manipulator2d.c @@ -31,8 +31,7 @@ * Used for UV/Image Editor */ -#include "BKE_context.h" -#include "BKE_editmesh.h" +#include "MEM_guardedalloc.h" #include "BLI_listbase.h" #include "BLI_math.h" @@ -43,12 +42,8 @@ #include "DNA_space_types.h" #include "DNA_view3d_types.h" -#include "ED_image.h" -#include "ED_screen.h" -#include "ED_uvedit.h" -#include "ED_manipulator_library.h" - -#include "MEM_guardedalloc.h" +#include "BKE_context.h" +#include "BKE_editmesh.h" #include "RNA_access.h" @@ -59,6 +54,11 @@ #include "WM_types.h" #include "wm.h" /* XXX */ +#include "ED_image.h" +#include "ED_screen.h" +#include "ED_uvedit.h" +#include "ED_manipulator_library.h" + #include "transform.h" /* own include */ /* axes as index */ |