Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDalai Felinto <dalai@blender.org>2020-03-19 11:33:03 +0300
committerDalai Felinto <dalai@blender.org>2020-03-19 11:33:58 +0300
commit2d1cce8331f3ecdfb8cb0c651e111ffac5dc7153 (patch)
treeec50d7bdca3901a6afcc986943011f08f9516307 /source/blender/draw/engines/eevee
parent008aaaa37841ca27d2bba80d8859336655cef455 (diff)
Cleanup: `make format` after SortedIncludes change
Diffstat (limited to 'source/blender/draw/engines/eevee')
-rw-r--r--source/blender/draw/engines/eevee/eevee_data.c2
-rw-r--r--source/blender/draw/engines/eevee/eevee_depth_of_field.c2
-rw-r--r--source/blender/draw/engines/eevee/eevee_effects.c4
-rw-r--r--source/blender/draw/engines/eevee/eevee_lightprobes.c8
-rw-r--r--source/blender/draw/engines/eevee/eevee_lookdev.c4
-rw-r--r--source/blender/draw/engines/eevee/eevee_materials.c2
-rw-r--r--source/blender/draw/engines/eevee/eevee_motion_blur.c4
-rw-r--r--source/blender/draw/engines/eevee/eevee_render.c2
-rw-r--r--source/blender/draw/engines/eevee/eevee_screen_raytrace.c2
-rw-r--r--source/blender/draw/engines/eevee/eevee_shadows.c2
-rw-r--r--source/blender/draw/engines/eevee/eevee_subsurface.c4
-rw-r--r--source/blender/draw/engines/eevee/eevee_temporal_sampling.c2
-rw-r--r--source/blender/draw/engines/eevee/eevee_volumes.c6
13 files changed, 22 insertions, 22 deletions
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;