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/editors/render
parent008aaaa37841ca27d2bba80d8859336655cef455 (diff)
Cleanup: `make format` after SortedIncludes change
Diffstat (limited to 'source/blender/editors/render')
-rw-r--r--source/blender/editors/render/render_internal.c16
-rw-r--r--source/blender/editors/render/render_opengl.c24
-rw-r--r--source/blender/editors/render/render_preview.c24
-rw-r--r--source/blender/editors/render/render_shading.c4
-rw-r--r--source/blender/editors/render/render_update.c2
-rw-r--r--source/blender/editors/render/render_view.c6
6 files changed, 38 insertions, 38 deletions
diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c
index f687120d228..8a8fd703845 100644
--- a/source/blender/editors/render/render_internal.c
+++ b/source/blender/editors/render/render_internal.c
@@ -22,15 +22,15 @@
*/
#include <math.h>
-#include <string.h>
#include <stddef.h>
+#include <string.h>
#include "MEM_guardedalloc.h"
#include "BLI_listbase.h"
-#include "BLI_timecode.h"
#include "BLI_math.h"
#include "BLI_threads.h"
+#include "BLI_timecode.h"
#include "BLI_utildefines.h"
#include "PIL_time.h"
@@ -39,14 +39,14 @@
#include "DNA_object_types.h"
#include "DNA_scene_types.h"
-#include "DNA_view3d_types.h"
#include "DNA_userdef_types.h"
+#include "DNA_view3d_types.h"
#include "BKE_blender_undo.h"
#include "BKE_blender_version.h"
#include "BKE_camera.h"
-#include "BKE_context.h"
#include "BKE_colortools.h"
+#include "BKE_context.h"
#include "BKE_global.h"
#include "BKE_image.h"
#include "BKE_layer.h"
@@ -55,9 +55,9 @@
#include "BKE_node.h"
#include "BKE_object.h"
#include "BKE_report.h"
-#include "BKE_sequencer.h"
-#include "BKE_screen.h"
#include "BKE_scene.h"
+#include "BKE_screen.h"
+#include "BKE_sequencer.h"
#include "BKE_undo_system.h"
#include "DEG_depsgraph.h"
@@ -68,14 +68,14 @@
#include "ED_object.h"
#include "ED_render.h"
#include "ED_screen.h"
-#include "ED_util.h"
#include "ED_undo.h"
+#include "ED_util.h"
#include "ED_view3d.h"
#include "BIF_glutil.h"
-#include "RE_pipeline.h"
#include "RE_engine.h"
+#include "RE_pipeline.h"
#include "IMB_colormanagement.h"
#include "IMB_imbuf_types.h"
diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c
index 6baf8cdba07..442f700ad6f 100644
--- a/source/blender/editors/render/render_opengl.c
+++ b/source/blender/editors/render/render_opengl.c
@@ -22,26 +22,26 @@
*/
#include <math.h>
-#include <string.h>
#include <stddef.h>
+#include <string.h>
#include "MEM_guardedalloc.h"
-#include "DNA_camera_types.h"
#include "BLI_bitmap.h"
+#include "BLI_blenlib.h"
#include "BLI_math.h"
#include "BLI_math_color_blend.h"
-#include "BLI_blenlib.h"
-#include "BLI_utildefines.h"
-#include "BLI_threads.h"
#include "BLI_task.h"
+#include "BLI_threads.h"
+#include "BLI_utildefines.h"
+#include "DNA_camera_types.h"
-#include "DNA_anim_types.h"
#include "DNA_action_types.h"
+#include "DNA_anim_types.h"
#include "DNA_curve_types.h"
-#include "DNA_scene_types.h"
-#include "DNA_object_types.h"
#include "DNA_gpencil_types.h"
+#include "DNA_object_types.h"
+#include "DNA_scene_types.h"
#include "BKE_animsys.h"
#include "BKE_camera.h"
@@ -65,15 +65,15 @@
#include "WM_api.h"
#include "WM_types.h"
+#include "ED_gpencil.h"
#include "ED_screen.h"
#include "ED_view3d.h"
#include "ED_view3d_offscreen.h"
-#include "ED_gpencil.h"
-#include "RE_pipeline.h"
-#include "IMB_imbuf_types.h"
-#include "IMB_imbuf.h"
#include "IMB_colormanagement.h"
+#include "IMB_imbuf.h"
+#include "IMB_imbuf_types.h"
+#include "RE_pipeline.h"
#include "RNA_access.h"
#include "RNA_define.h"
diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c
index 369572a5d6d..1427c6ed500 100644
--- a/source/blender/editors/render/render_preview.c
+++ b/source/blender/editors/render/render_preview.c
@@ -23,8 +23,8 @@
/* global includes */
-#include <stdlib.h>
#include <math.h>
+#include <stdlib.h>
#include <string.h>
#ifndef WIN32
@@ -34,37 +34,37 @@
#endif
#include "MEM_guardedalloc.h"
-#include "BLI_math.h"
#include "BLI_blenlib.h"
+#include "BLI_math.h"
#include "BLI_utildefines.h"
#include "PIL_time.h"
#include "BLO_readfile.h"
-#include "DNA_world_types.h"
+#include "DNA_brush_types.h"
#include "DNA_camera_types.h"
#include "DNA_collection_types.h"
+#include "DNA_light_types.h"
#include "DNA_material_types.h"
#include "DNA_node_types.h"
#include "DNA_object_types.h"
-#include "DNA_light_types.h"
-#include "DNA_space_types.h"
#include "DNA_scene_types.h"
-#include "DNA_brush_types.h"
#include "DNA_screen_types.h"
+#include "DNA_space_types.h"
+#include "DNA_world_types.h"
#include "BKE_appdir.h"
#include "BKE_brush.h"
-#include "BKE_context.h"
#include "BKE_colortools.h"
+#include "BKE_context.h"
#include "BKE_global.h"
+#include "BKE_icons.h"
#include "BKE_idprop.h"
#include "BKE_image.h"
-#include "BKE_icons.h"
+#include "BKE_layer.h"
#include "BKE_lib_id.h"
#include "BKE_light.h"
-#include "BKE_layer.h"
#include "BKE_main.h"
#include "BKE_material.h"
#include "BKE_node.h"
@@ -73,8 +73,8 @@
#include "BKE_world.h"
#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph_query.h"
#include "IMB_imbuf.h"
#include "IMB_imbuf_types.h"
@@ -82,11 +82,11 @@
#include "BIF_glutil.h"
-#include "GPU_shader.h"
#include "GPU_glew.h"
+#include "GPU_shader.h"
-#include "RE_pipeline.h"
#include "RE_engine.h"
+#include "RE_pipeline.h"
#include "RE_shader_ext.h"
#include "WM_api.h"
diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c
index d022de0545f..62a078bedb7 100644
--- a/source/blender/editors/render/render_shading.c
+++ b/source/blender/editors/render/render_shading.c
@@ -36,9 +36,9 @@
#include "DNA_space_types.h"
#include "DNA_world_types.h"
-#include "BLI_utildefines.h"
#include "BLI_listbase.h"
#include "BLI_math_vector.h"
+#include "BLI_utildefines.h"
#include "BLT_translation.h"
@@ -76,10 +76,10 @@
#include "WM_api.h"
#include "WM_types.h"
-#include "ED_object.h"
#include "ED_curve.h"
#include "ED_mesh.h"
#include "ED_node.h"
+#include "ED_object.h"
#include "ED_render.h"
#include "ED_scene.h"
#include "ED_screen.h"
diff --git a/source/blender/editors/render/render_update.c b/source/blender/editors/render/render_update.c
index e494bd90d65..d2bb53de06f 100644
--- a/source/blender/editors/render/render_update.c
+++ b/source/blender/editors/render/render_update.c
@@ -32,9 +32,9 @@
#include "DNA_screen_types.h"
#include "DNA_space_types.h"
#include "DNA_view3d_types.h"
+#include "DNA_windowmanager_types.h"
#include "DNA_workspace_types.h"
#include "DNA_world_types.h"
-#include "DNA_windowmanager_types.h"
#include "DRW_engine.h"
diff --git a/source/blender/editors/render/render_view.c b/source/blender/editors/render/render_view.c
index 1aa0c0ab37d..a93ea343229 100644
--- a/source/blender/editors/render/render_view.c
+++ b/source/blender/editors/render/render_view.c
@@ -21,8 +21,8 @@
* \ingroup edrend
*/
-#include <string.h>
#include <stddef.h>
+#include <string.h>
#include "BLI_listbase.h"
#include "BLI_utildefines.h"
@@ -31,11 +31,11 @@
#include "DNA_userdef_types.h"
#include "BKE_context.h"
-#include "BKE_image.h"
#include "BKE_global.h"
+#include "BKE_image.h"
#include "BKE_main.h"
-#include "BKE_screen.h"
#include "BKE_report.h"
+#include "BKE_screen.h"
#include "BLT_translation.h"