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/render/extern/include/RE_engine.h     |  4 ++--
 source/blender/render/extern/include/RE_pipeline.h   |  2 +-
 source/blender/render/intern/include/render_types.h  |  2 +-
 source/blender/render/intern/source/bake_api.c       |  4 ++--
 .../blender/render/intern/source/external_engine.c   | 10 +++++-----
 source/blender/render/intern/source/imagetexture.c   | 10 +++++-----
 source/blender/render/intern/source/initrender.c     |  8 ++++----
 source/blender/render/intern/source/multires_bake.c  |  8 ++++----
 source/blender/render/intern/source/pipeline.c       | 20 ++++++++++----------
 source/blender/render/intern/source/pointdensity.c   | 10 +++++-----
 source/blender/render/intern/source/render_result.c  |  8 ++++----
 source/blender/render/intern/source/render_texture.c | 12 ++++++------
 12 files changed, 49 insertions(+), 49 deletions(-)

(limited to 'source/blender/render')

diff --git a/source/blender/render/extern/include/RE_engine.h b/source/blender/render/extern/include/RE_engine.h
index 38cba264a01..ac05c6c963c 100644
--- a/source/blender/render/extern/include/RE_engine.h
+++ b/source/blender/render/extern/include/RE_engine.h
@@ -25,10 +25,10 @@
 #define __RE_ENGINE_H__
 
 #include "DNA_listBase.h"
-#include "DNA_scene_types.h"
 #include "DNA_node_types.h"
-#include "RNA_types.h"
+#include "DNA_scene_types.h"
 #include "RE_bake.h"
+#include "RNA_types.h"
 
 #include "BLI_threads.h"
 
diff --git a/source/blender/render/extern/include/RE_pipeline.h b/source/blender/render/extern/include/RE_pipeline.h
index 7816c72a033..319d8b1c2ed 100644
--- a/source/blender/render/extern/include/RE_pipeline.h
+++ b/source/blender/render/extern/include/RE_pipeline.h
@@ -24,9 +24,9 @@
 #ifndef __RE_PIPELINE_H__
 #define __RE_PIPELINE_H__
 
+#include "DEG_depsgraph.h"
 #include "DNA_listBase.h"
 #include "DNA_vec_types.h"
-#include "DEG_depsgraph.h"
 
 struct Image;
 struct ImageFormatData;
diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h
index fd60e4ac0fc..1318e2498bb 100644
--- a/source/blender/render/intern/include/render_types.h
+++ b/source/blender/render/intern/include/render_types.h
@@ -28,8 +28,8 @@
 /* exposed internal in render module only! */
 /* ------------------------------------------------------------------------- */
 
-#include "DNA_scene_types.h"
 #include "DNA_object_types.h"
+#include "DNA_scene_types.h"
 
 #include "BLI_threads.h"
 
diff --git a/source/blender/render/intern/source/bake_api.c b/source/blender/render/intern/source/bake_api.c
index ca6ae3fb78c..e823a481d59 100644
--- a/source/blender/render/intern/source/bake_api.c
+++ b/source/blender/render/intern/source/bake_api.c
@@ -75,12 +75,12 @@
 #include "BKE_image.h"
 #include "BKE_lib_id.h"
 #include "BKE_mesh.h"
-#include "BKE_mesh_tangent.h"
 #include "BKE_mesh_runtime.h"
+#include "BKE_mesh_tangent.h"
 #include "BKE_node.h"
 
-#include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"
+#include "IMB_imbuf_types.h"
 
 #include "RE_bake.h"
 
diff --git a/source/blender/render/intern/source/external_engine.c b/source/blender/render/intern/source/external_engine.c
index 4fcb5f5f16e..7c071bb6b04 100644
--- a/source/blender/render/intern/source/external_engine.c
+++ b/source/blender/render/intern/source/external_engine.c
@@ -29,17 +29,17 @@
 
 #include "BLT_translation.h"
 
-#include "BLI_utildefines.h"
 #include "BLI_ghash.h"
 #include "BLI_listbase.h"
 #include "BLI_rect.h"
 #include "BLI_string.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_object_types.h"
 
 #include "BKE_camera.h"
-#include "BKE_global.h"
 #include "BKE_colortools.h"
+#include "BKE_global.h"
 #include "BKE_layer.h"
 #include "BKE_node.h"
 #include "BKE_report.h"
@@ -55,16 +55,16 @@
 #  include "BPY_extern.h"
 #endif
 
+#include "RE_bake.h"
 #include "RE_engine.h"
 #include "RE_pipeline.h"
-#include "RE_bake.h"
 
 #include "DRW_engine.h"
 
 #include "initrender.h"
-#include "renderpipeline.h"
-#include "render_types.h"
 #include "render_result.h"
+#include "render_types.h"
+#include "renderpipeline.h"
 
 /* Render Engine Types */
 
diff --git a/source/blender/render/intern/source/imagetexture.c b/source/blender/render/intern/source/imagetexture.c
index 253741401f1..7b28728cfe7 100644
--- a/source/blender/render/intern/source/imagetexture.c
+++ b/source/blender/render/intern/source/imagetexture.c
@@ -21,26 +21,26 @@
  * \ingroup render
  */
 
-#include <stdio.h>
-#include <string.h>
 #include <fcntl.h>
-#include <math.h>
 #include <float.h>
+#include <math.h>
+#include <stdio.h>
+#include <string.h>
 #ifndef WIN32
 #  include <unistd.h>
 #else
 #  include <io.h>
 #endif
 
-#include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"
+#include "IMB_imbuf_types.h"
 
 #include "DNA_image_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_texture_types.h"
 
-#include "BLI_math.h"
 #include "BLI_blenlib.h"
+#include "BLI_math.h"
 #include "BLI_threads.h"
 #include "BLI_utildefines.h"
 
diff --git a/source/blender/render/intern/source/initrender.c b/source/blender/render/intern/source/initrender.c
index e2e2e09d393..5a6ecfc3e20 100644
--- a/source/blender/render/intern/source/initrender.c
+++ b/source/blender/render/intern/source/initrender.c
@@ -24,15 +24,15 @@
 /* Global includes */
 
 #include <math.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_math.h"
-#include "BLI_ghash.h"
 #include "BLI_blenlib.h"
+#include "BLI_ghash.h"
+#include "BLI_math.h"
 #include "BLI_utildefines.h"
 
 #include "DNA_camera_types.h"
@@ -40,8 +40,8 @@
 #include "BKE_camera.h"
 
 /* this module */
-#include "renderpipeline.h"
 #include "render_types.h"
+#include "renderpipeline.h"
 
 /* Own includes */
 #include "initrender.h"
diff --git a/source/blender/render/intern/source/multires_bake.c b/source/blender/render/intern/source/multires_bake.c
index 5421f487de5..7c301f7d591 100644
--- a/source/blender/render/intern/source/multires_bake.c
+++ b/source/blender/render/intern/source/multires_bake.c
@@ -25,12 +25,12 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "DNA_object_types.h"
 #include "DNA_mesh_types.h"
+#include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
-#include "BLI_math.h"
 #include "BLI_listbase.h"
+#include "BLI_math.h"
 #include "BLI_threads.h"
 
 #include "BKE_ccg.h"
@@ -38,8 +38,8 @@
 #include "BKE_image.h"
 #include "BKE_material.h"
 #include "BKE_mesh.h"
-#include "BKE_multires.h"
 #include "BKE_modifier.h"
+#include "BKE_multires.h"
 #include "BKE_subsurf.h"
 
 #include "DEG_depsgraph.h"
@@ -48,8 +48,8 @@
 #include "RE_pipeline.h"
 #include "RE_shader_ext.h"
 
-#include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"
+#include "IMB_imbuf_types.h"
 
 typedef void (*MPassKnownData)(DerivedMesh *lores_dm,
                                DerivedMesh *hires_dm,
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 183ef89892e..ccf1d4031cd 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -21,12 +21,12 @@
  * \ingroup render
  */
 
-#include <math.h>
+#include <errno.h>
 #include <limits.h>
-#include <string.h>
-#include <stdlib.h>
+#include <math.h>
 #include <stddef.h>
-#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "DNA_anim_types.h"
 #include "DNA_collection_types.h"
@@ -40,14 +40,14 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "BLI_fileops.h"
+#include "BLI_listbase.h"
 #include "BLI_math.h"
+#include "BLI_path_util.h"
 #include "BLI_rect.h"
-#include "BLI_listbase.h"
 #include "BLI_string.h"
-#include "BLI_path_util.h"
-#include "BLI_timecode.h"
-#include "BLI_fileops.h"
 #include "BLI_threads.h"
+#include "BLI_timecode.h"
 
 #include "BLT_translation.h"
 
@@ -77,11 +77,11 @@
 #include "DEG_depsgraph_debug.h"
 #include "DEG_depsgraph_query.h"
 
-#include "PIL_time.h"
 #include "IMB_colormanagement.h"
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 #include "IMB_metadata.h"
+#include "PIL_time.h"
 
 #include "RE_engine.h"
 #include "RE_pipeline.h"
@@ -99,9 +99,9 @@
 
 /* internal */
 #include "initrender.h"
-#include "renderpipeline.h"
 #include "render_result.h"
 #include "render_types.h"
+#include "renderpipeline.h"
 
 /* render flow
  *
diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c
index ffc03dfa2ab..edade21fd27 100644
--- a/source/blender/render/intern/source/pointdensity.c
+++ b/source/blender/render/intern/source/pointdensity.c
@@ -22,17 +22,17 @@
  */
 
 #include <math.h>
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_math.h"
 #include "BLI_blenlib.h"
-#include "BLI_noise.h"
 #include "BLI_kdopbvh.h"
-#include "BLI_utildefines.h"
+#include "BLI_math.h"
+#include "BLI_noise.h"
 #include "BLI_task.h"
+#include "BLI_utildefines.h"
 
 #include "BLT_translation.h"
 
@@ -43,12 +43,12 @@
 #include "DNA_texture_types.h"
 
 #include "BKE_colorband.h"
+#include "BKE_colortools.h"
 #include "BKE_deform.h"
 #include "BKE_lattice.h"
 #include "BKE_object.h"
 #include "BKE_particle.h"
 #include "BKE_scene.h"
-#include "BKE_colortools.h"
 
 #include "DEG_depsgraph.h"
 #include "DEG_depsgraph_query.h"
diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/source/render_result.c
index 0f39073c693..814e9b1c79e 100644
--- a/source/blender/render/intern/source/render_result.c
+++ b/source/blender/render/intern/source/render_result.c
@@ -21,22 +21,22 @@
  * \ingroup render
  */
 
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_utildefines.h"
 #include "BLI_ghash.h"
-#include "BLI_listbase.h"
 #include "BLI_hash_md5.h"
+#include "BLI_listbase.h"
 #include "BLI_path_util.h"
 #include "BLI_rect.h"
 #include "BLI_string.h"
 #include "BLI_string_utils.h"
 #include "BLI_threads.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_appdir.h"
 #include "BKE_camera.h"
@@ -45,9 +45,9 @@
 #include "BKE_report.h"
 #include "BKE_scene.h"
 
+#include "IMB_colormanagement.h"
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
-#include "IMB_colormanagement.h"
 
 #include "intern/openexr/openexr_multi.h"
 
diff --git a/source/blender/render/intern/source/render_texture.c b/source/blender/render/intern/source/render_texture.c
index fe162212b9c..22cc1f0eddf 100644
--- a/source/blender/render/intern/source/render_texture.c
+++ b/source/blender/render/intern/source/render_texture.c
@@ -21,10 +21,10 @@
  * \ingroup render
  */
 
+#include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <math.h>
 
 #include "BLI_math.h"
 #include "BLI_noise.h"
@@ -32,16 +32,16 @@
 #include "BLI_utildefines.h"
 
 #include "DNA_anim_types.h"
-#include "DNA_texture_types.h"
-#include "DNA_object_types.h"
+#include "DNA_image_types.h"
 #include "DNA_light_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_material_types.h"
-#include "DNA_image_types.h"
+#include "DNA_meshdata_types.h"
 #include "DNA_node_types.h"
+#include "DNA_object_types.h"
+#include "DNA_texture_types.h"
 
-#include "IMB_imbuf_types.h"
 #include "IMB_colormanagement.h"
+#include "IMB_imbuf_types.h"
 
 #include "BKE_image.h"
 #include "BKE_node.h"
-- 
cgit v1.2.3