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/space_image
parent008aaaa37841ca27d2bba80d8859336655cef455 (diff)
Cleanup: `make format` after SortedIncludes change
Diffstat (limited to 'source/blender/editors/space_image')
-rw-r--r--source/blender/editors/space_image/image_buttons.c6
-rw-r--r--source/blender/editors/space_image/image_draw.c12
-rw-r--r--source/blender/editors/space_image/image_edit.c2
-rw-r--r--source/blender/editors/space_image/image_ops.c16
-rw-r--r--source/blender/editors/space_image/image_undo.c8
-rw-r--r--source/blender/editors/space_image/space_image.c16
6 files changed, 30 insertions, 30 deletions
diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c
index 54bd2f37f3a..873091bd68d 100644
--- a/source/blender/editors/space_image/image_buttons.c
+++ b/source/blender/editors/space_image/image_buttons.c
@@ -21,8 +21,8 @@
* \ingroup spimage
*/
-#include <string.h>
#include <stdio.h>
+#include <string.h>
#include "DNA_node_types.h"
#include "DNA_scene_types.h"
@@ -37,8 +37,8 @@
#include "BKE_context.h"
#include "BKE_image.h"
#include "BKE_node.h"
-#include "BKE_screen.h"
#include "BKE_scene.h"
+#include "BKE_screen.h"
#include "RE_pipeline.h"
@@ -47,8 +47,8 @@
#include "IMB_imbuf_types.h"
#include "ED_gpencil.h"
-#include "ED_screen.h"
#include "ED_image.h"
+#include "ED_screen.h"
#include "RNA_access.h"
diff --git a/source/blender/editors/space_image/image_draw.c b/source/blender/editors/space_image/image_draw.c
index d1b2c2330ac..a58abb2fbd5 100644
--- a/source/blender/editors/space_image/image_draw.c
+++ b/source/blender/editors/space_image/image_draw.c
@@ -27,26 +27,26 @@
#include "MEM_guardedalloc.h"
+#include "DNA_brush_types.h"
#include "DNA_camera_types.h"
+#include "DNA_mask_types.h"
#include "DNA_object_types.h"
-#include "DNA_space_types.h"
#include "DNA_scene_types.h"
#include "DNA_screen_types.h"
-#include "DNA_brush_types.h"
-#include "DNA_mask_types.h"
+#include "DNA_space_types.h"
#include "PIL_time.h"
#include "BLI_listbase.h"
#include "BLI_math.h"
#include "BLI_rect.h"
-#include "BLI_threads.h"
#include "BLI_string.h"
+#include "BLI_threads.h"
#include "BLI_utildefines.h"
+#include "IMB_colormanagement.h"
#include "IMB_imbuf.h"
#include "IMB_imbuf_types.h"
-#include "IMB_colormanagement.h"
#include "IMB_moviecache.h"
#include "BKE_context.h"
@@ -72,8 +72,8 @@
#include "UI_resources.h"
#include "UI_view2d.h"
-#include "RE_pipeline.h"
#include "RE_engine.h"
+#include "RE_pipeline.h"
#include "image_intern.h"
diff --git a/source/blender/editors/space_image/image_edit.c b/source/blender/editors/space_image/image_edit.c
index 9d07780f756..99190fa2d39 100644
--- a/source/blender/editors/space_image/image_edit.c
+++ b/source/blender/editors/space_image/image_edit.c
@@ -26,8 +26,8 @@
#include "DNA_object_types.h"
#include "DNA_scene_types.h"
-#include "BLI_rect.h"
#include "BLI_listbase.h"
+#include "BLI_rect.h"
#include "BKE_colortools.h"
#include "BKE_context.h"
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index 395329e5f6e..0f823933c24 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -21,11 +21,11 @@
* \ingroup spimage
*/
-#include <stddef.h>
-#include <string.h>
+#include <errno.h>
#include <fcntl.h>
+#include <stddef.h>
#include <stdlib.h>
-#include <errno.h>
+#include <string.h>
#ifndef WIN32
# include <unistd.h>
#else
@@ -46,31 +46,31 @@
#include "BLT_translation.h"
#include "DNA_camera_types.h"
-#include "DNA_object_types.h"
#include "DNA_node_types.h"
+#include "DNA_object_types.h"
#include "DNA_packedFile_types.h"
#include "DNA_scene_types.h"
#include "DNA_screen_types.h"
#include "BKE_colortools.h"
#include "BKE_context.h"
+#include "BKE_global.h"
#include "BKE_icons.h"
#include "BKE_image.h"
#include "BKE_image_save.h"
-#include "BKE_global.h"
#include "BKE_lib_id.h"
#include "BKE_main.h"
#include "BKE_packedFile.h"
#include "BKE_paint.h"
#include "BKE_report.h"
-#include "BKE_screen.h"
#include "BKE_scene.h"
+#include "BKE_screen.h"
#include "DEG_depsgraph.h"
#include "GPU_draw.h"
-#include "GPU_state.h"
#include "GPU_immediate.h"
+#include "GPU_state.h"
#include "IMB_colormanagement.h"
#include "IMB_imbuf.h"
@@ -90,8 +90,8 @@
#include "ED_render.h"
#include "ED_screen.h"
#include "ED_space_api.h"
-#include "ED_uvedit.h"
#include "ED_util.h"
+#include "ED_uvedit.h"
#include "UI_interface.h"
#include "UI_resources.h"
diff --git a/source/blender/editors/space_image/image_undo.c b/source/blender/editors/space_image/image_undo.c
index eac330b4ff2..1394c05d7bc 100644
--- a/source/blender/editors/space_image/image_undo.c
+++ b/source/blender/editors/space_image/image_undo.c
@@ -34,16 +34,16 @@
#include "MEM_guardedalloc.h"
-#include "BLI_math.h"
#include "BLI_blenlib.h"
-#include "BLI_utildefines.h"
+#include "BLI_math.h"
#include "BLI_threads.h"
+#include "BLI_utildefines.h"
#include "DNA_image_types.h"
-#include "DNA_windowmanager_types.h"
#include "DNA_object_types.h"
#include "DNA_screen_types.h"
#include "DNA_space_types.h"
+#include "DNA_windowmanager_types.h"
#include "IMB_imbuf.h"
#include "IMB_imbuf_types.h"
@@ -55,10 +55,10 @@
#include "DEG_depsgraph.h"
+#include "ED_object.h"
#include "ED_paint.h"
#include "ED_undo.h"
#include "ED_util.h"
-#include "ED_object.h"
#include "GPU_draw.h"
diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c
index 1fff40ab73a..a9cbebc5655 100644
--- a/source/blender/editors/space_image/space_image.c
+++ b/source/blender/editors/space_image/space_image.c
@@ -22,12 +22,12 @@
*/
#include "DNA_gpencil_types.h"
-#include "DNA_mesh_types.h"
+#include "DNA_image_types.h"
#include "DNA_mask_types.h"
+#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_object_types.h"
#include "DNA_scene_types.h"
-#include "DNA_image_types.h"
#include "MEM_guardedalloc.h"
@@ -59,23 +59,23 @@
#include "ED_mesh.h"
#include "ED_node.h"
#include "ED_render.h"
-#include "ED_space_api.h"
#include "ED_screen.h"
-#include "ED_uvedit.h"
+#include "ED_space_api.h"
#include "ED_transform.h"
+#include "ED_uvedit.h"
#include "WM_api.h"
-#include "WM_types.h"
#include "WM_message.h"
+#include "WM_types.h"
-#include "UI_resources.h"
#include "UI_interface.h"
+#include "UI_resources.h"
#include "UI_view2d.h"
-#include "image_intern.h"
-#include "GPU_framebuffer.h"
#include "GPU_batch_presets.h"
+#include "GPU_framebuffer.h"
#include "GPU_viewport.h"
+#include "image_intern.h"
/* TODO(fclem) remove bad level calls */
#include "../draw/DRW_engine.h"