Cleanup: BLI headers first

Also move descriptions into doxy header

source/blender/blenkernel/intern/object_facemap.c

@@ -34,6 +34,12 @@
 #include "DNA_object_types.h"
 #include "DNA_mesh_types.h"
 
+#include "BLI_utildefines.h"
+#include "BLI_path_util.h"
+#include "BLI_string.h"
+#include "BLI_string_utils.h"
+#include "BLI_listbase.h"
+
 #include "BKE_context.h"
 #include "BKE_customdata.h"
 #include "BKE_editmesh.h"
@@ -41,12 +47,6 @@
 #include "BKE_object_facemap.h"  /* own include */
 #include "BKE_object_deform.h"
 
-#include "BLI_utildefines.h"
-#include "BLI_path_util.h"
-#include "BLI_string.h"
-#include "BLI_string_utils.h"
-#include "BLI_listbase.h"
-
 #include "BLT_translation.h"
 
 #include "MEM_guardedalloc.h"

source/blender/draw/engines/clay/clay_engine.c

@@ -19,7 +19,9 @@
  *
  */
 
-#include "DRW_render.h"
+#include "BLI_utildefines.h"
+#include "BLI_dynstr.h"
+#include "BLI_rand.h"
 
 #include "DNA_particle_types.h"
 
@@ -28,9 +30,6 @@
 #include "BKE_main.h"
 #include "BKE_particle.h"
 
-#include "BLI_dynstr.h"
-#include "BLI_rand.h"
-
 #include "GPU_shader.h"
 
 #include "IMB_imbuf.h"
@@ -39,6 +38,8 @@
 #include "UI_resources.h"
 #include "UI_interface_icons.h"
 
+#include "DRW_render.h"
+
 #include "clay_engine.h"
 
 #ifdef WITH_CLAY_ENGINE

source/blender/draw/engines/eevee/eevee_bloom.c

@@ -19,19 +19,18 @@
  *
  */
 
-/* Eevee's bloom shader
- */
-
 /** \file eevee_bloom.c
  *  \ingroup draw_engine
+ *
+ * Eevee's bloom shader.
  */
 
 #include "DRW_render.h"
 
-#include "BKE_global.h" /* for G.debug_value */
-
 #include "BLI_dynstr.h"
 
+#include "BKE_global.h" /* for G.debug_value */
+
 #include "eevee_private.h"
 #include "GPU_extensions.h"
 #include "GPU_texture.h"

source/blender/draw/engines/eevee/eevee_data.c

@@ -19,11 +19,10 @@
  *
  */
 
-/* All specific data handler for Objects, Lights, SceneLayers, ...
- */
-
 /** \file eevee_data.c
  *  \ingroup draw_engine
+ *
+ * All specific data handler for Objects, Lights, SceneLayers, ...
  */
 
 #include "DRW_render.h"

source/blender/draw/engines/eevee/eevee_depth_of_field.c

@@ -19,15 +19,17 @@
  *
  */
 
-/* Depth of field post process effect
- */
-
 /** \file eevee_depth_of_field.c
  *  \ingroup draw_engine
+ *
+ * Depth of field post process effect.
  */
 
 #include "DRW_render.h"
 
+#include "BLI_dynstr.h"
+#include "BLI_rand.h"
+
 #include "DNA_anim_types.h"
 #include "DNA_camera_types.h"
 #include "DNA_object_force.h"
@@ -42,18 +44,15 @@
 #include "BKE_animsys.h"
 #include "BKE_screen.h"
 
-#include "ED_screen.h"
-
 #include "DEG_depsgraph.h"
 
-#include "BLI_dynstr.h"
-#include "BLI_rand.h"
-
 #include "eevee_private.h"
 #include "GPU_extensions.h"
 #include "GPU_framebuffer.h"
 #include "GPU_texture.h"
 
+#include "ED_screen.h"
+
 static struct {
 	/* Depth Of Field */
 	struct GPUShader *dof_downsample_sh;

source/blender/draw/engines/eevee/eevee_effects.c

@@ -19,11 +19,10 @@
  *
  */
 
-/* Gather all screen space effects technique such as Bloom, Motion Blur, DoF, SSAO, SSR, ...
- */
-
 /** \file eevee_effects.c
  *  \ingroup draw_engine
+ *
+ * Gather all screen space effects technique such as Bloom, Motion Blur, DoF, SSAO, SSR, ...
  */
 
 #include "DRW_render.h"

source/blender/draw/engines/eevee/eevee_engine.c

@@ -23,7 +23,6 @@
  *  \ingroup draw_engine
  */
 
-#include "DNA_world_types.h"
 #include "DRW_render.h"
 
 #include "BLI_dynstr.h"
@@ -31,6 +30,8 @@
 
 #include "BKE_object.h"
 
+#include "DNA_world_types.h"
+
 #include "GPU_material.h"
 #include "GPU_glew.h"
 

source/blender/draw/engines/eevee/eevee_lightprobes.c

@@ -23,6 +23,12 @@
  *  \ingroup DNA
  */
 
+#include "DRW_render.h"
+
+#include "BLI_utildefines.h"
+#include "BLI_dynstr.h"
+#include "BLI_rand.h"
+
 #include "DNA_world_types.h"
 #include "DNA_texture_types.h"
 #include "DNA_image_types.h"
@@ -31,20 +37,15 @@
 
 #include "BKE_object.h"
 
-#include "BLI_dynstr.h"
-#include "BLI_rand.h"
-
-#include "ED_screen.h"
-
 #include "GPU_material.h"
 #include "GPU_texture.h"
 #include "GPU_glew.h"
 
-#include "DRW_render.h"
-
 #include "eevee_engine.h"
 #include "eevee_private.h"
 
+#include "ED_screen.h"
+
 #define IRRADIANCE_POOL_SIZE 1024
 
 static struct {

source/blender/draw/engines/eevee/eevee_materials.c

@@ -25,10 +25,6 @@
 
 #include "DRW_render.h"
 
-#include "DNA_world_types.h"
-#include "DNA_modifier_types.h"
-#include "DNA_view3d_types.h"
-
 #include "BLI_dynstr.h"
 #include "BLI_ghash.h"
 #include "BLI_alloca.h"
@@ -37,6 +33,10 @@
 #include "BKE_paint.h"
 #include "BKE_pbvh.h"
 
+#include "DNA_world_types.h"
+#include "DNA_modifier_types.h"
+#include "DNA_view3d_types.h"
+
 #include "GPU_material.h"
 
 #include "eevee_engine.h"

source/blender/draw/engines/eevee/eevee_motion_blur.c

@@ -19,25 +19,24 @@
  *
  */
 
-/* Gather all screen space effects technique such as Bloom, Motion Blur, DoF, SSAO, SSR, ...
- */
-
 /** \file eevee_effects.c
  *  \ingroup draw_engine
+ *
+ * Gather all screen space effects technique such as Bloom, Motion Blur, DoF, SSAO, SSR, ...
  */
 
 #include "DRW_render.h"
 
-#include "DNA_anim_types.h"
-#include "DNA_camera_types.h"
-#include "DNA_screen_types.h"
-
 #include "BKE_global.h" /* for G.debug_value */
 #include "BKE_camera.h"
 #include "BKE_object.h"
 #include "BKE_animsys.h"
 #include "BKE_screen.h"
 
+#include "DNA_anim_types.h"
+#include "DNA_camera_types.h"
+#include "DNA_screen_types.h"
+
 #include "ED_screen.h"
 
 #include "DEG_depsgraph.h"

source/blender/draw/engines/eevee/eevee_occlusion.c

@@ -19,21 +19,20 @@
  *
  */
 
-/* Implementation of the screen space Ground Truth Ambient Occlusion.
- */
-
 /** \file eevee_occlusion.c
  *  \ingroup draw_engine
+ *
+ * Implementation of the screen space Ground Truth Ambient Occlusion.
  */
 
 #include "DRW_render.h"
 
+#include "BLI_dynstr.h"
+
 #include "DNA_anim_types.h"
 
 #include "BKE_global.h" /* for G.debug_value */
 
-#include "BLI_dynstr.h"
-
 #include "eevee_private.h"
 
 static struct {

source/blender/draw/engines/eevee/eevee_screen_raytrace.c

@@ -19,11 +19,10 @@
  *
  */
 
-/* Screen space reflections and refractions techniques.
- */
-
 /** \file eevee_screen_raytrace.c
  *  \ingroup draw_engine
+ *
+ * Screen space reflections and refractions techniques.
  */
 
 #include "DRW_render.h"

source/blender/draw/engines/eevee/eevee_subsurface.c

@@ -19,11 +19,10 @@
  *
  */
 
-/* Screen space subsurface scattering technique.
- */
-
 /** \file eevee_subsurface.c
  *  \ingroup draw_engine
+ *
+ * Screen space subsurface scattering technique.
  */
 
 #include "DRW_render.h"

source/blender/draw/engines/eevee/eevee_temporal_sampling.c

@@ -19,11 +19,10 @@
  *
  */
 
-/* Temporal super sampling technique
- */
-
 /** \file eevee_temporal_sampling.c
  *  \ingroup draw_engine
+ *
+ * Temporal super sampling technique
  */
 
 #include "DRW_render.h"

source/blender/draw/engines/eevee/eevee_volumes.c

@@ -19,15 +19,17 @@
  *
  */
 
-/* Volumetric effects rendering using frostbite approach.
- */
-
 /** \file eevee_volume.c
  *  \ingroup draw_engine
+ *
+ * Volumetric effects rendering using frostbite approach.
  */
 
 #include "DRW_render.h"
 
+#include "BLI_dynstr.h"
+#include "BLI_rand.h"
+
 #include "DNA_object_force.h"
 #include "DNA_smoke_types.h"
 #include "DNA_world_types.h"
@@ -39,9 +41,6 @@
 
 #include "ED_screen.h"
 
-#include "BLI_dynstr.h"
-#include "BLI_rand.h"
-
 #include "eevee_private.h"
 #include "GPU_draw.h"
 #include "GPU_texture.h"

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"
 

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 "MEM_guardedalloc.h"
-
-#include "BKE_context.h"
 
 #include "BLI_math.h"
 
 #include "DNA_view3d_types.h"
 #include "DNA_object_types.h"
 
-#include "ED_view3d.h"
+#include "BKE_context.h"
-#include "ED_screen.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 */

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"
 

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 "BKE_context.h"
-#include "ED_manipulator_library.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"
 

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 "BKE_context.h"
-#include "ED_screen.h"
-#include "ED_manipulator_library.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"

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 "MEM_guardedalloc.h"
-
-#include "BKE_context.h"
 
 #include "BLI_math.h"
 #include "BLI_dial.h"
 #include "BLI_rect.h"
 
-#include "ED_screen.h"
+#include "BKE_context.h"
-#include "ED_view3d.h"
+
-#include "ED_manipulator_library.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"
 

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 "MEM_guardedalloc.h"
-
-#include "BKE_context.h"
 
 #include "BLI_math.h"
 #include "BLI_dial.h"
 #include "BLI_rect.h"
 
-#include "ED_screen.h"
+#include "BKE_context.h"
-#include "ED_view3d.h"
+
-#include "ED_manipulator_library.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"
 

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 "MEM_guardedalloc.h"
-#include "BIF_glutil.h"
-
-#include "BKE_context.h"
 
 #include "BLI_math.h"
 
-#include "ED_screen.h"
+#include "BKE_context.h"
-#include "ED_view3d.h"
-#include "ED_manipulator_library.h"
 
-#include "GPU_select.h"
+#include "BIF_gl.h"
-
+#include "BIF_glutil.h"
-#include "GPU_matrix.h"
 
 #include "GPU_immediate.h"
 #include "GPU_immediate_util.h"
-
+#include "GPU_matrix.h"
-#include "MEM_guardedalloc.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"

source/blender/editors/manipulator_library/manipulator_types/grab3d_manipulator.c

@@ -33,25 +33,19 @@
  *
  */
 
-#include "BIF_gl.h"
+#include "MEM_guardedalloc.h"
-#include "BIF_glutil.h"
-
-#include "BKE_context.h"
 
 #include "BLI_math.h"
 
-#include "ED_screen.h"
+#include "BKE_context.h"
-#include "ED_view3d.h"
-#include "ED_manipulator_library.h"
 
-#include "GPU_select.h"
+#include "BIF_gl.h"
-
+#include "BIF_glutil.h"
-#include "GPU_matrix.h"
 
 #include "GPU_immediate.h"
 #include "GPU_immediate_util.h"
-
+#include "GPU_matrix.h"
-#include "MEM_guardedalloc.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"

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 "MEM_guardedalloc.h"
-
-#include "BKE_context.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"
 

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,20 +45,14 @@
 
 #include "DEG_depsgraph.h"
 
-#include "BLI_utildefines.h"
-#include "BLI_path_util.h"
-#include "BLI_string.h"
-#include "BLI_listbase.h"
-
-#include "MEM_guardedalloc.h"
-
-#include "ED_mesh.h"
-#include "ED_object.h"
-
 #include "RNA_define.h"
 #include "RNA_access.h"
 
-#include <string.h>
+#include "WM_types.h"
+#include "WM_api.h"
+
+#include "ED_mesh.h"
+#include "ED_object.h"
 
 #include "object_intern.h"
 

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.

source/blender/editors/space_outliner/outliner_ops.c

@@ -28,15 +28,13 @@
  *  \ingroup spoutliner
  */
 
-#include "BKE_context.h"
+#include "MEM_guardedalloc.h"
-#include "BKE_main.h"
 
 #include "BLI_listbase.h"
 #include "BLI_math.h"
 
-#include "ED_screen.h"
+#include "BKE_context.h"
-
+#include "BKE_main.h"
-#include "MEM_guardedalloc.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,

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

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"

source/blender/editors/transform/transform_manipulator2d.c

@@ -31,8 +31,7 @@
  * Used for UV/Image Editor
  */
 
-#include "BKE_context.h"
+#include "MEM_guardedalloc.h"
-#include "BKE_editmesh.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 "BKE_context.h"
-#include "ED_screen.h"
+#include "BKE_editmesh.h"
-#include "ED_uvedit.h"
-#include "ED_manipulator_library.h"
-
-#include "MEM_guardedalloc.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 */

source/blender/makesrna/intern/rna_workspace.c

@@ -43,10 +43,10 @@
 
 #ifdef RNA_RUNTIME
 
-#include "BKE_global.h"
-
 #include "BLI_listbase.h"
 
+#include "BKE_global.h"
+
 #include "DNA_object_types.h"
 #include "DNA_screen_types.h"
 

source/blender/windowmanager/manipulators/intern/wm_manipulator.c

@@ -27,22 +27,19 @@
  *  \ingroup wm
  */
 
-#include "BKE_context.h"
+#include "MEM_guardedalloc.h"
 
 #include "BLI_listbase.h"
 #include "BLI_math.h"
 #include "BLI_string.h"
 #include "BLI_string_utils.h"
 
-#include "ED_screen.h"
+#include "BKE_context.h"
-#include "ED_view3d.h"
 
 #include "GPU_batch.h"
 #include "GPU_glew.h"
 #include "GPU_immediate.h"
 
-#include "MEM_guardedalloc.h"
-
 #include "RNA_access.h"
 #include "RNA_define.h"
 
@@ -53,6 +50,9 @@
 #include "WM_api.h"
 #include "WM_types.h"
 
+#include "ED_screen.h"
+#include "ED_view3d.h"
+
 #ifdef WITH_PYTHON
 #include "BPY_extern.h"
 #endif

source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c

@@ -35,16 +35,14 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "BKE_context.h"
+#include "MEM_guardedalloc.h"
-#include "BKE_main.h"
-#include "BKE_report.h"
 
 #include "BLI_listbase.h"
 #include "BLI_string.h"
 
-#include "ED_screen.h"
+#include "BKE_context.h"
-
+#include "BKE_main.h"
-#include "MEM_guardedalloc.h"
+#include "BKE_report.h"
 
 #include "RNA_access.h"
 #include "RNA_define.h"
@@ -53,6 +51,8 @@
 #include "WM_types.h"
 #include "wm_event_system.h"
 
+#include "ED_screen.h"
+
 /* own includes */
 #include "wm_manipulator_wmapi.h"
 #include "wm_manipulator_intern.h"

source/blender/windowmanager/manipulators/intern/wm_manipulator_target_props.c

@@ -22,15 +22,12 @@
  *  \ingroup wm
  */
 
-#include "BKE_context.h"
-
 #include "BLI_listbase.h"
 #include "BLI_math.h"
 #include "BLI_string.h"
 #include "BLI_string_utils.h"
 
-#include "ED_screen.h"
+#include "BKE_context.h"
-#include "ED_view3d.h"
 
 #include "MEM_guardedalloc.h"
 
@@ -41,6 +38,9 @@
 
 #include "wm.h"
 
+#include "ED_screen.h"
+#include "ED_view3d.h"
+
 /* own includes */
 #include "wm_manipulator_wmapi.h"
 #include "wm_manipulator_intern.h"