Cleanup: BLI headers first
authorCampbell Barton <ideasman42@gmail.com>
Mon, 20 Nov 2017 03:11:45 +0000 (14:11 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 20 Nov 2017 03:29:50 +0000 (14:29 +1100)
Also move descriptions into doxy header

36 files changed:
source/blender/blenkernel/intern/object_facemap.c
source/blender/draw/engines/clay/clay_engine.c
source/blender/draw/engines/eevee/eevee_bloom.c
source/blender/draw/engines/eevee/eevee_data.c
source/blender/draw/engines/eevee/eevee_depth_of_field.c
source/blender/draw/engines/eevee/eevee_effects.c
source/blender/draw/engines/eevee/eevee_engine.c
source/blender/draw/engines/eevee/eevee_lightprobes.c
source/blender/draw/engines/eevee/eevee_lights.c
source/blender/draw/engines/eevee/eevee_materials.c
source/blender/draw/engines/eevee/eevee_motion_blur.c
source/blender/draw/engines/eevee/eevee_occlusion.c
source/blender/draw/engines/eevee/eevee_screen_raytrace.c
source/blender/draw/engines/eevee/eevee_subsurface.c
source/blender/draw/engines/eevee/eevee_temporal_sampling.c
source/blender/draw/engines/eevee/eevee_volumes.c
source/blender/editors/manipulator_library/manipulator_draw_utils.c
source/blender/editors/manipulator_library/manipulator_library_presets.c
source/blender/editors/manipulator_library/manipulator_library_utils.c
source/blender/editors/manipulator_library/manipulator_types/arrow2d_manipulator.c
source/blender/editors/manipulator_library/manipulator_types/arrow3d_manipulator.c
source/blender/editors/manipulator_library/manipulator_types/cage2d_manipulator.c
source/blender/editors/manipulator_library/manipulator_types/cage3d_manipulator.c
source/blender/editors/manipulator_library/manipulator_types/dial3d_manipulator.c
source/blender/editors/manipulator_library/manipulator_types/grab3d_manipulator.c
source/blender/editors/manipulator_library/manipulator_types/primitive3d_manipulator.c
source/blender/editors/object/object_facemap_ops.c
source/blender/editors/screen/workspace_layout_edit.c
source/blender/editors/space_outliner/outliner_ops.c
source/blender/editors/space_outliner/outliner_utils.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/transform/transform_manipulator2d.c
source/blender/makesrna/intern/rna_workspace.c
source/blender/windowmanager/manipulators/intern/wm_manipulator.c
source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c
source/blender/windowmanager/manipulators/intern/wm_manipulator_target_props.c

index 700935de0e897a939e83f884ed3afbda034704c5..1218dd376cb0caf98614aa732fba5f53b23242cb 100644 (file)
 #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"
 #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"
index c4d4ff1a56d026768412ed5fbb3b9ccb5f176072..760ecab12d3f71c35c213dd66577e006399f8125 100644 (file)
@@ -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
index 1bb3878278adb2a7e90b2808919e2c21cd3a73f5..21fba216fb72c965e37c96234b192a16e5286b5d 100644 (file)
  *
  */
 
-/* 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"
index 92a992f578b9103428373a40599b419b40f9c0f6..1faffe3bb171a6584cb778b19ca9e5c4e247d616 100644 (file)
  *
  */
 
-/* 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"
index c5836c754068123d77da6e0a02f1fa615baec772..275be6efa39dc884f3cc263937d079dcd9d5acb1 100644 (file)
  *
  */
 
-/* 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"
 #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;
index 86d767df313f265c14b2f5ce43776a5ff924a4d2..603fc1aa14ac5764f335f056055814d8ca06eb63 100644 (file)
  *
  */
 
-/* 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"
index 4ca59aaa39e42f11c60f3b082b073794e76b4227..72ebfe94f16f533b558578f31ebacff59ac0cf26 100644 (file)
@@ -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"
 
index aa5624646f3eb0cb0a5ede271e164fa05286ac66..a8b9b963cb1a6828949ec63d9241414c83d30566 100644 (file)
  *  \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"
 
 #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 {
index 6c1ed2770051991644ba9dda41727ea81d396f8c..9c30ecba03f4ad396659729a809769c9b5d8a821 100644 (file)
@@ -1058,4 +1058,4 @@ void EEVEE_lights_free(void)
                DRW_SHADER_FREE_SAFE(e_data.shadow_copy_cube_sh[i]);
                DRW_SHADER_FREE_SAFE(e_data.shadow_copy_cascade_sh[i]);
        }
-}
\ No newline at end of file
+}
index b0e30109a7f2f14bce14f633f53703de48524ae2..6721547e2b0d9a01f862e3bbddf52372a09e446b 100644 (file)
 
 #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"
 #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"
index 5ca2dfe194935a25c9512c19cc97e0a2ce14e958..b9ec1f8b186be025fac2b51cc5ac2d1502eb37a5 100644 (file)
  *
  */
 
-/* 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"
index 86a9fb2ff1ac962fe7c78d32377cf4a1b7e15f54..a6b35ce1b16c3ff20fb60f6486acea08999b9ac0 100644 (file)
  *
  */
 
-/* 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 {
index e287ba6fc145be2ff1a5251b669254225ac6501b..c6162f1d6936fe31ddde7440f524ed818cbef932 100644 (file)
  *
  */
 
-/* Screen space reflections and refractions techniques.
- */
-
 /** \file eevee_screen_raytrace.c
  *  \ingroup draw_engine
+ *
+ * Screen space reflections and refractions techniques.
  */
 
 #include "DRW_render.h"
index 2784125ca58c5b337ad199766a8f2f8e9e90ab6a..6827d44aea406f9c87951e0fab0b15244c8f6689 100644 (file)
  *
  */
 
-/* Screen space subsurface scattering technique.
- */
-
 /** \file eevee_subsurface.c
  *  \ingroup draw_engine
+ *
+ * Screen space subsurface scattering technique.
  */
 
 #include "DRW_render.h"
index 6e70ba45edf5a3a98ef8d78773d45f270a8d5eaf..d5580c21a1f6f72476555aef2eb18e1e5921a346 100644 (file)
  *
  */
 
-/* Temporal super sampling technique
- */
-
 /** \file eevee_temporal_sampling.c
  *  \ingroup draw_engine
+ *
+ * Temporal super sampling technique
  */
 
 #include "DRW_render.h"
index 4ee50cfb082f3e04c3482d301e27968cd95c98e9..760205f49371e4680806e77a6fe63efad27831fa 100644 (file)
  *
  */
 
-/* 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"
index f15cd9c9793d95d28922f92d9be57aa67f79bdfb..430841311aa744d29b7d006ea03a3716946f23fb 100644 (file)
  *  \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"
 
index e552a7a6aa3aefc5ffe3fc20b7d5782d6727e838..7b8d2104992d328de675d044cab6638bc45df2a3 100644 (file)
  * \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 */
index fb1d1f89626a46af5fbacd1dbf915e417a8f9de1..38b518b19922cd1f3432ddd75db1aee0f8576635 100644 (file)
  * \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"
 
index 44dd5698a48b9fe15d57ffe4902816ad388012b8..749e92e25fb6be046ec7ed152a5f944a80c37f0b 100644 (file)
  * \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"
 
index 3bbcafb925a730af305250df390865ad704e3c9b..e9760e3e2700f3d5196c886dc7d328cf42855fd2 100644 (file)
 
 #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"
 #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"
index d1902864d5750f68d75f4310a89b3ddcc69ba958..0299a33d0fed297f6c96f80378b0b2bf6ae16d84 100644 (file)
  * 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"
 #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"
 
index e116a26fd594f34f14eb278b294c7b704189f3e7..d58cdb4b1871ca140f58bc3d2d35fc1c9dd8911f 100644 (file)
  * 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"
 #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"
 
index ec490a0d047507e76df058e945db8b056d82dcbf..f2f5851ff0c83fabb6ceda16c51b1a41e66878ca 100644 (file)
  * - `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"
 #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"
index 5353104a1fd753e8b7f77ac858f80d0d21c64d1d..151e173e5e667973144e2f9963549022e16b85a5 100644 (file)
  *
  */
 
-#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"
 #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"
index eea14f2033fbd11ee1aa632ba3f8d99391e1ef49..531cf742e6fff61056cda33b3036e584972de8f9 100644 (file)
  * 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"
 
index d526ea93ffa160b57fb11ab6ffd9cb0d7ecce22d..857446ac6b0beef6041c328124f5ce1a25e6eeb6 100644 (file)
  * ***** 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"
 
 #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 */
index e4dd841f833714ac1a8b51427f4c6698e0472ae2..d84df1601252665b278de97e787c2d1f108e3fac 100644 (file)
 
 #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.
index 6946993d6307ad9c99d6a6ae903091995c8a5b74..aa6a5dba6a7438ee2d29a19aaa8e46879c449b4d 100644 (file)
  *  \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,
index f123b240efc527575cb3c95535b8b221d23eef10..d3f7fd7055ebe85baaa133b518752ff7f357fa20 100644 (file)
  *  \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
index 1e273462d52e1940286d0fff9eec25125f5f34d6..eeca75b730883d32a8bcd87544d6f7e204b0f139 100644 (file)
 
 #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"
 
 
 #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"
index 94f425eb9f0ae1a3a40cc1f5142b86b5c6a1701e..6e2d0d8c5c0077fa188f1cbaa291926956da8b85 100644 (file)
@@ -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"
 #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"
 
 #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 */
index e09f7bcbcc13693ffeef4ea45844f9317f222f45..354e400a392bdf80dc7dcf98e49a4eba3c0ce6e5 100644 (file)
 
 #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"
 
index 52c8fb242441a62f245797984f1e508b8ad00ded..7ca1f8fd5f2fc6969d8456cd4ad99790e5b2d7d2 100644 (file)
  *  \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 "ED_view3d.h"
+#include "BKE_context.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
index e0b12289b9e71147352d6c35be3e553467c05458..d62aac8cd87b75b5fdfa7d08cbdbad2444a420e3 100644 (file)
 #include <stdlib.h>
 #include <string.h>
 
-#include "BKE_context.h"
-#include "BKE_main.h"
-#include "BKE_report.h"
+#include "MEM_guardedalloc.h"
 
 #include "BLI_listbase.h"
 #include "BLI_string.h"
 
-#include "ED_screen.h"
-
-#include "MEM_guardedalloc.h"
+#include "BKE_context.h"
+#include "BKE_main.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"
index b4f658073413eda4fddca9bafe181a615b2855b0..11bf981490e0b79f4a133ff0958342870c0c7a24 100644 (file)
  *  \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 "ED_view3d.h"
+#include "BKE_context.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"