From 2d1cce8331f3ecdfb8cb0c651e111ffac5dc7153 Mon Sep 17 00:00:00 2001
From: Dalai Felinto <dalai@blender.org>
Date: Thu, 19 Mar 2020 09:33:03 +0100
Subject: Cleanup: `make format` after SortedIncludes change

---
 source/blender/draw/engines/eevee/eevee_data.c              | 2 +-
 source/blender/draw/engines/eevee/eevee_depth_of_field.c    | 2 +-
 source/blender/draw/engines/eevee/eevee_effects.c           | 4 ++--
 source/blender/draw/engines/eevee/eevee_lightprobes.c       | 8 ++++----
 source/blender/draw/engines/eevee/eevee_lookdev.c           | 4 ++--
 source/blender/draw/engines/eevee/eevee_materials.c         | 2 +-
 source/blender/draw/engines/eevee/eevee_motion_blur.c       | 4 ++--
 source/blender/draw/engines/eevee/eevee_render.c            | 2 +-
 source/blender/draw/engines/eevee/eevee_screen_raytrace.c   | 2 +-
 source/blender/draw/engines/eevee/eevee_shadows.c           | 2 +-
 source/blender/draw/engines/eevee/eevee_subsurface.c        | 4 ++--
 source/blender/draw/engines/eevee/eevee_temporal_sampling.c | 2 +-
 source/blender/draw/engines/eevee/eevee_volumes.c           | 6 +++---
 source/blender/draw/engines/gpencil/gpencil_cache_utils.c   | 4 ++--
 source/blender/draw/engines/gpencil/gpencil_engine.c        | 2 +-
 source/blender/draw/engines/gpencil/gpencil_shader_fx.c     | 2 +-
 source/blender/draw/engines/overlay/overlay_armature.c      | 4 ++--
 source/blender/draw/engines/overlay/overlay_background.c    | 2 +-
 source/blender/draw/engines/overlay/overlay_extra.c         | 4 ++--
 source/blender/draw/engines/overlay/overlay_facing.c        | 2 +-
 source/blender/draw/engines/overlay/overlay_sculpt.c        | 2 +-
 source/blender/draw/engines/overlay/overlay_wireframe.c     | 2 +-
 source/blender/draw/engines/select/select_engine.c          | 2 +-
 source/blender/draw/engines/workbench/workbench_data.c      | 2 +-
 source/blender/draw/engines/workbench/workbench_materials.c | 2 +-
 source/blender/draw/engines/workbench/workbench_private.h   | 2 +-
 source/blender/draw/engines/workbench/workbench_volume.c    | 2 +-
 27 files changed, 39 insertions(+), 39 deletions(-)

(limited to 'source/blender/draw/engines')

diff --git a/source/blender/draw/engines/eevee/eevee_data.c b/source/blender/draw/engines/eevee/eevee_data.c
index e586fc7b1db..6874947de55 100644
--- a/source/blender/draw/engines/eevee/eevee_data.c
+++ b/source/blender/draw/engines/eevee/eevee_data.c
@@ -24,8 +24,8 @@
 
 #include "DRW_render.h"
 
-#include "eevee_private.h"
 #include "eevee_lightcache.h"
+#include "eevee_private.h"
 
 void EEVEE_view_layer_data_free(void *storage)
 {
diff --git a/source/blender/draw/engines/eevee/eevee_depth_of_field.c b/source/blender/draw/engines/eevee/eevee_depth_of_field.c
index 572e38a9395..ec6770e4549 100644
--- a/source/blender/draw/engines/eevee/eevee_depth_of_field.c
+++ b/source/blender/draw/engines/eevee/eevee_depth_of_field.c
@@ -34,9 +34,9 @@
 #include "DEG_depsgraph.h"
 #include "DEG_depsgraph_query.h"
 
-#include "eevee_private.h"
 #include "GPU_framebuffer.h"
 #include "GPU_texture.h"
+#include "eevee_private.h"
 
 static struct {
   /* Depth Of Field */
diff --git a/source/blender/draw/engines/eevee/eevee_effects.c b/source/blender/draw/engines/eevee/eevee_effects.c
index 90bfad45f60..05b18da4374 100644
--- a/source/blender/draw/engines/eevee/eevee_effects.c
+++ b/source/blender/draw/engines/eevee/eevee_effects.c
@@ -26,11 +26,11 @@
 
 #include "BKE_global.h" /* for G.debug_value */
 
-#include "eevee_private.h"
-#include "GPU_texture.h"
 #include "GPU_extensions.h"
 #include "GPU_platform.h"
 #include "GPU_state.h"
+#include "GPU_texture.h"
+#include "eevee_private.h"
 
 static struct {
   /* Downsample Depth */
diff --git a/source/blender/draw/engines/eevee/eevee_lightprobes.c b/source/blender/draw/engines/eevee/eevee_lightprobes.c
index 1e08741db26..9816632c0c3 100644
--- a/source/blender/draw/engines/eevee/eevee_lightprobes.c
+++ b/source/blender/draw/engines/eevee/eevee_lightprobes.c
@@ -22,22 +22,22 @@
 
 #include "DRW_render.h"
 
-#include "BLI_utildefines.h"
 #include "BLI_rand.h"
+#include "BLI_utildefines.h"
 
-#include "DNA_world_types.h"
-#include "DNA_texture_types.h"
 #include "DNA_image_types.h"
 #include "DNA_lightprobe_types.h"
+#include "DNA_texture_types.h"
 #include "DNA_view3d_types.h"
+#include "DNA_world_types.h"
 
 #include "BKE_collection.h"
 #include "BKE_object.h"
 #include "MEM_guardedalloc.h"
 
+#include "GPU_extensions.h"
 #include "GPU_material.h"
 #include "GPU_texture.h"
-#include "GPU_extensions.h"
 
 #include "DEG_depsgraph_query.h"
 
diff --git a/source/blender/draw/engines/eevee/eevee_lookdev.c b/source/blender/draw/engines/eevee/eevee_lookdev.c
index a725a3583f3..b33be750d80 100644
--- a/source/blender/draw/engines/eevee/eevee_lookdev.c
+++ b/source/blender/draw/engines/eevee/eevee_lookdev.c
@@ -24,8 +24,8 @@
 #include "BKE_camera.h"
 #include "BKE_studiolight.h"
 
-#include "BLI_rect.h"
 #include "BLI_rand.h"
+#include "BLI_rect.h"
 
 #include "DNA_screen_types.h"
 #include "DNA_world_types.h"
@@ -36,8 +36,8 @@
 
 #include "UI_resources.h"
 
-#include "eevee_private.h"
 #include "eevee_lightcache.h"
+#include "eevee_private.h"
 
 #include "draw_common.h"
 
diff --git a/source/blender/draw/engines/eevee/eevee_materials.c b/source/blender/draw/engines/eevee/eevee_materials.c
index bb64fe32bc3..2062f4d83c9 100644
--- a/source/blender/draw/engines/eevee/eevee_materials.c
+++ b/source/blender/draw/engines/eevee/eevee_materials.c
@@ -22,9 +22,9 @@
 
 #include "DRW_render.h"
 
+#include "BLI_alloca.h"
 #include "BLI_dynstr.h"
 #include "BLI_ghash.h"
-#include "BLI_alloca.h"
 #include "BLI_math_bits.h"
 #include "BLI_rand.h"
 #include "BLI_string_utils.h"
diff --git a/source/blender/draw/engines/eevee/eevee_motion_blur.c b/source/blender/draw/engines/eevee/eevee_motion_blur.c
index 80c38839b71..13927cd5124 100644
--- a/source/blender/draw/engines/eevee/eevee_motion_blur.c
+++ b/source/blender/draw/engines/eevee/eevee_motion_blur.c
@@ -24,9 +24,9 @@
 
 #include "DRW_render.h"
 
+#include "BKE_animsys.h"
 #include "BKE_camera.h"
 #include "BKE_object.h"
-#include "BKE_animsys.h"
 
 #include "DNA_anim_types.h"
 #include "DNA_camera_types.h"
@@ -37,8 +37,8 @@
 #include "DEG_depsgraph.h"
 #include "DEG_depsgraph_query.h"
 
-#include "eevee_private.h"
 #include "GPU_texture.h"
+#include "eevee_private.h"
 
 static struct {
   /* Motion Blur */
diff --git a/source/blender/draw/engines/eevee/eevee_render.c b/source/blender/draw/engines/eevee/eevee_render.c
index c8357b56b18..255c6c50c2d 100644
--- a/source/blender/draw/engines/eevee/eevee_render.c
+++ b/source/blender/draw/engines/eevee/eevee_render.c
@@ -38,8 +38,8 @@
 
 #include "DEG_depsgraph_query.h"
 
-#include "GPU_framebuffer.h"
 #include "GPU_extensions.h"
+#include "GPU_framebuffer.h"
 #include "GPU_state.h"
 
 #include "RE_pipeline.h"
diff --git a/source/blender/draw/engines/eevee/eevee_screen_raytrace.c b/source/blender/draw/engines/eevee/eevee_screen_raytrace.c
index e875187bdbf..2e467fe8535 100644
--- a/source/blender/draw/engines/eevee/eevee_screen_raytrace.c
+++ b/source/blender/draw/engines/eevee/eevee_screen_raytrace.c
@@ -29,8 +29,8 @@
 
 #include "DEG_depsgraph_query.h"
 
-#include "eevee_private.h"
 #include "GPU_texture.h"
+#include "eevee_private.h"
 
 /* SSR shader variations */
 enum {
diff --git a/source/blender/draw/engines/eevee/eevee_shadows.c b/source/blender/draw/engines/eevee/eevee_shadows.c
index f5b98d464dd..fb338d85fde 100644
--- a/source/blender/draw/engines/eevee/eevee_shadows.c
+++ b/source/blender/draw/engines/eevee/eevee_shadows.c
@@ -20,8 +20,8 @@
  * \ingroup EEVEE
  */
 
-#include "BLI_sys_types.h" /* bool */
 #include "BLI_string_utils.h"
+#include "BLI_sys_types.h" /* bool */
 
 // #include "BLI_dynstr.h"
 // #include "BLI_rand.h"
diff --git a/source/blender/draw/engines/eevee/eevee_subsurface.c b/source/blender/draw/engines/eevee/eevee_subsurface.c
index bab89a8a87b..3f4008eb8b9 100644
--- a/source/blender/draw/engines/eevee/eevee_subsurface.c
+++ b/source/blender/draw/engines/eevee/eevee_subsurface.c
@@ -28,9 +28,9 @@
 
 #include "DEG_depsgraph_query.h"
 
-#include "eevee_private.h"
-#include "GPU_texture.h"
 #include "GPU_extensions.h"
+#include "GPU_texture.h"
+#include "eevee_private.h"
 
 static struct {
   struct GPUShader *sss_sh[3];
diff --git a/source/blender/draw/engines/eevee/eevee_temporal_sampling.c b/source/blender/draw/engines/eevee/eevee_temporal_sampling.c
index bd77279eb4a..1f44b815a42 100644
--- a/source/blender/draw/engines/eevee/eevee_temporal_sampling.c
+++ b/source/blender/draw/engines/eevee/eevee_temporal_sampling.c
@@ -30,8 +30,8 @@
 
 #include "DEG_depsgraph_query.h"
 
-#include "eevee_private.h"
 #include "GPU_texture.h"
+#include "eevee_private.h"
 
 #define FILTER_CDF_TABLE_SIZE 512
 
diff --git a/source/blender/draw/engines/eevee/eevee_volumes.c b/source/blender/draw/engines/eevee/eevee_volumes.c
index 7c17b7098d2..5ea7aaa7207 100644
--- a/source/blender/draw/engines/eevee/eevee_volumes.c
+++ b/source/blender/draw/engines/eevee/eevee_volumes.c
@@ -27,8 +27,8 @@
 #include "BLI_rand.h"
 #include "BLI_string_utils.h"
 
-#include "DNA_object_force_types.h"
 #include "DNA_fluid_types.h"
+#include "DNA_object_force_types.h"
 #include "DNA_volume_types.h"
 #include "DNA_world_types.h"
 
@@ -43,11 +43,11 @@
 
 #include "DEG_depsgraph_query.h"
 
-#include "eevee_private.h"
 #include "GPU_draw.h"
 #include "GPU_extensions.h"
-#include "GPU_texture.h"
 #include "GPU_material.h"
+#include "GPU_texture.h"
+#include "eevee_private.h"
 
 static struct {
   char *volumetric_common_lib;
diff --git a/source/blender/draw/engines/gpencil/gpencil_cache_utils.c b/source/blender/draw/engines/gpencil/gpencil_cache_utils.c
index 3459685f504..a5f67b7831e 100644
--- a/source/blender/draw/engines/gpencil/gpencil_cache_utils.c
+++ b/source/blender/draw/engines/gpencil/gpencil_cache_utils.c
@@ -29,12 +29,12 @@
 #include "DNA_gpencil_types.h"
 #include "DNA_view3d_types.h"
 
-#include "BKE_lib_id.h"
 #include "BKE_gpencil.h"
+#include "BKE_lib_id.h"
 #include "BKE_object.h"
 
-#include "BLI_memblock.h"
 #include "BLI_link_utils.h"
+#include "BLI_memblock.h"
 
 #include "gpencil_engine.h"
 
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c
index 37aef5a633a..0270b1a1d8c 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@ -47,8 +47,8 @@
 
 #include "DEG_depsgraph_query.h"
 
-#include "ED_view3d.h"
 #include "ED_screen.h"
+#include "ED_view3d.h"
 
 #include "UI_resources.h"
 
diff --git a/source/blender/draw/engines/gpencil/gpencil_shader_fx.c b/source/blender/draw/engines/gpencil/gpencil_shader_fx.c
index 9467efcd18c..7ce7a726bb7 100644
--- a/source/blender/draw/engines/gpencil/gpencil_shader_fx.c
+++ b/source/blender/draw/engines/gpencil/gpencil_shader_fx.c
@@ -19,10 +19,10 @@
 /** \file
  * \ingroup draw
  */
+#include "DNA_camera_types.h"
 #include "DNA_gpencil_types.h"
 #include "DNA_shader_fx_types.h"
 #include "DNA_view3d_types.h"
-#include "DNA_camera_types.h"
 
 #include "BKE_gpencil.h"
 
diff --git a/source/blender/draw/engines/overlay/overlay_armature.c b/source/blender/draw/engines/overlay/overlay_armature.c
index 3bf91b0d0be..49dece13869 100644
--- a/source/blender/draw/engines/overlay/overlay_armature.c
+++ b/source/blender/draw/engines/overlay/overlay_armature.c
@@ -20,15 +20,15 @@
  * \ingroup draw_engine
  */
 
+#include <math.h>
 #include <stdlib.h>
 #include <string.h>
-#include <math.h>
 
 #include "DNA_armature_types.h"
 #include "DNA_constraint_types.h"
+#include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_view3d_types.h"
-#include "DNA_object_types.h"
 
 #include "DRW_render.h"
 
diff --git a/source/blender/draw/engines/overlay/overlay_background.c b/source/blender/draw/engines/overlay/overlay_background.c
index 286a9311989..f1ffa9035e0 100644
--- a/source/blender/draw/engines/overlay/overlay_background.c
+++ b/source/blender/draw/engines/overlay/overlay_background.c
@@ -24,8 +24,8 @@
 
 #include "UI_resources.h"
 
-#include "overlay_private.h"
 #include "draw_manager_text.h"
+#include "overlay_private.h"
 
 #define BG_SOLID 0
 #define BG_GRADIENT 1
diff --git a/source/blender/draw/engines/overlay/overlay_extra.c b/source/blender/draw/engines/overlay/overlay_extra.c
index 4c525acd5be..bc0797eff0d 100644
--- a/source/blender/draw/engines/overlay/overlay_extra.c
+++ b/source/blender/draw/engines/overlay/overlay_extra.c
@@ -31,21 +31,21 @@
 #include "BKE_global.h"
 #include "BKE_mball.h"
 #include "BKE_mesh.h"
-#include "BKE_movieclip.h"
 #include "BKE_modifier.h"
+#include "BKE_movieclip.h"
 #include "BKE_object.h"
 #include "BKE_tracking.h"
 
 #include "DNA_camera_types.h"
 #include "DNA_constraint_types.h"
 #include "DNA_curve_types.h"
+#include "DNA_fluid_types.h"
 #include "DNA_lightprobe_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meta_types.h"
 #include "DNA_modifier_types.h"
 #include "DNA_object_force_types.h"
 #include "DNA_rigidbody_types.h"
-#include "DNA_fluid_types.h"
 
 #include "DEG_depsgraph_query.h"
 
diff --git a/source/blender/draw/engines/overlay/overlay_facing.c b/source/blender/draw/engines/overlay/overlay_facing.c
index 74d82262019..872fa0e8796 100644
--- a/source/blender/draw/engines/overlay/overlay_facing.c
+++ b/source/blender/draw/engines/overlay/overlay_facing.c
@@ -20,8 +20,8 @@
  * \ingroup draw_engine
  */
 
-#include "DRW_render.h"
 #include "BKE_paint.h"
+#include "DRW_render.h"
 
 #include "overlay_private.h"
 
diff --git a/source/blender/draw/engines/overlay/overlay_sculpt.c b/source/blender/draw/engines/overlay/overlay_sculpt.c
index ba37f56800b..391c49e0695 100644
--- a/source/blender/draw/engines/overlay/overlay_sculpt.c
+++ b/source/blender/draw/engines/overlay/overlay_sculpt.c
@@ -24,8 +24,8 @@
 
 #include "overlay_private.h"
 
-#include "BKE_pbvh.h"
 #include "BKE_paint.h"
+#include "BKE_pbvh.h"
 #include "BKE_subdiv_ccg.h"
 
 void OVERLAY_sculpt_cache_init(OVERLAY_Data *vedata)
diff --git a/source/blender/draw/engines/overlay/overlay_wireframe.c b/source/blender/draw/engines/overlay/overlay_wireframe.c
index cdf8005b827..3e4e3478e18 100644
--- a/source/blender/draw/engines/overlay/overlay_wireframe.c
+++ b/source/blender/draw/engines/overlay/overlay_wireframe.c
@@ -33,8 +33,8 @@
 
 #include "BLI_hash.h"
 
-#include "GPU_shader.h"
 #include "DRW_render.h"
+#include "GPU_shader.h"
 
 #include "ED_view3d.h"
 
diff --git a/source/blender/draw/engines/select/select_engine.c b/source/blender/draw/engines/select/select_engine.c
index 389133b0d84..f357beb0bd8 100644
--- a/source/blender/draw/engines/select/select_engine.c
+++ b/source/blender/draw/engines/select/select_engine.c
@@ -32,8 +32,8 @@
 #include "draw_cache_impl.h"
 #include "draw_manager.h"
 
-#include "select_private.h"
 #include "select_engine.h"
+#include "select_private.h"
 
 #define SELECT_ENGINE "SELECT_ENGINE"
 
diff --git a/source/blender/draw/engines/workbench/workbench_data.c b/source/blender/draw/engines/workbench/workbench_data.c
index bc052e60009..f000028562f 100644
--- a/source/blender/draw/engines/workbench/workbench_data.c
+++ b/source/blender/draw/engines/workbench/workbench_data.c
@@ -26,8 +26,8 @@
 
 #include "DNA_userdef_types.h"
 
-#include "ED_view3d.h"
 #include "ED_screen.h"
+#include "ED_view3d.h"
 
 #include "UI_resources.h"
 
diff --git a/source/blender/draw/engines/workbench/workbench_materials.c b/source/blender/draw/engines/workbench/workbench_materials.c
index 246f5f88045..45f14c52ec5 100644
--- a/source/blender/draw/engines/workbench/workbench_materials.c
+++ b/source/blender/draw/engines/workbench/workbench_materials.c
@@ -30,8 +30,8 @@
 #include "BLI_dynstr.h"
 #include "BLI_hash.h"
 
-#include "DNA_node_types.h"
 #include "DNA_mesh_types.h"
+#include "DNA_node_types.h"
 
 #include "GPU_uniformbuffer.h"
 
diff --git a/source/blender/draw/engines/workbench/workbench_private.h b/source/blender/draw/engines/workbench/workbench_private.h
index 49becf93f48..1fa49c8f818 100644
--- a/source/blender/draw/engines/workbench/workbench_private.h
+++ b/source/blender/draw/engines/workbench/workbench_private.h
@@ -26,9 +26,9 @@
 #include "BKE_studiolight.h"
 
 #include "DNA_image_types.h"
+#include "DNA_userdef_types.h"
 #include "DNA_view3d_types.h"
 #include "DNA_world_types.h"
-#include "DNA_userdef_types.h"
 
 #include "DRW_render.h"
 
diff --git a/source/blender/draw/engines/workbench/workbench_volume.c b/source/blender/draw/engines/workbench/workbench_volume.c
index b9ea61fd013..951712d6ba3 100644
--- a/source/blender/draw/engines/workbench/workbench_volume.c
+++ b/source/blender/draw/engines/workbench/workbench_volume.c
@@ -27,8 +27,8 @@
 #include "DNA_object_force_types.h"
 #include "DNA_volume_types.h"
 
-#include "BLI_rand.h"
 #include "BLI_dynstr.h"
+#include "BLI_rand.h"
 #include "BLI_string_utils.h"
 
 #include "BKE_fluid.h"
-- 
cgit v1.2.3