Cleanup: make format after SortedIncludes change

source/blender/python/intern/bpy.c

@@ -24,26 +24,26 @@
 
 #include <Python.h>
 
-#include "BLI_utildefines.h"
 #include "BLI_string.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_appdir.h"
-#include "BKE_global.h" /* XXX, G_MAIN only */
 #include "BKE_blender_version.h"
 #include "BKE_bpath.h"
+#include "BKE_global.h" /* XXX, G_MAIN only */
 
-#include "RNA_types.h"
 #include "RNA_access.h"
+#include "RNA_types.h"
 
 #include "bpy.h"
-#include "bpy_capi_utils.h"
-#include "bpy_rna.h"
 #include "bpy_app.h"
-#include "bpy_rna_id_collection.h"
-#include "bpy_rna_gizmo.h"
-#include "bpy_props.h"
+#include "bpy_capi_utils.h"
 #include "bpy_library.h"
 #include "bpy_operator.h"
+#include "bpy_props.h"
+#include "bpy_rna.h"
+#include "bpy_rna_gizmo.h"
+#include "bpy_rna_id_collection.h"
 #include "bpy_utils_previews.h"
 #include "bpy_utils_units.h"
 

source/blender/python/intern/bpy_app.c

@@ -27,6 +27,7 @@
 #include "bpy_app.h"
 
 #include "bpy_app_alembic.h"
+#include "bpy_app_build_options.h"
 #include "bpy_app_ffmpeg.h"
 #include "bpy_app_ocio.h"
 #include "bpy_app_oiio.h"
@@ -34,7 +35,6 @@
 #include "bpy_app_openvdb.h"
 #include "bpy_app_sdl.h"
 #include "bpy_app_usd.h"
-#include "bpy_app_build_options.h"
 
 #include "bpy_app_translations.h"
 

source/blender/python/intern/bpy_app_alembic.c

@@ -21,8 +21,8 @@
  * \ingroup pythonintern
  */
 
-#include <Python.h>
 #include "BLI_utildefines.h"
+#include <Python.h>
 
 #include "bpy_app_alembic.h"
 

source/blender/python/intern/bpy_app_ffmpeg.c

@@ -18,8 +18,8 @@
  * \ingroup pythonintern
  */
 
-#include <Python.h>
 #include "BLI_utildefines.h"
+#include <Python.h>
 
 #include "bpy_app_ffmpeg.h"
 

source/blender/python/intern/bpy_app_handlers.c

@@ -22,15 +22,15 @@
  * functions into (called via blenders generic BLI_cb api)
  */
 
-#include <Python.h>
 #include "BLI_utildefines.h"
+#include <Python.h>
 
 #include "BKE_callbacks.h"
 
-#include "RNA_types.h"
 #include "RNA_access.h"
-#include "bpy_rna.h"
+#include "RNA_types.h"
 #include "bpy_app_handlers.h"
+#include "bpy_rna.h"
 
 #include "../generic/python_utildefines.h"
 

source/blender/python/intern/bpy_app_ocio.c

@@ -18,8 +18,8 @@
  * \ingroup pythonintern
  */
 
-#include <Python.h>
 #include "BLI_utildefines.h"
+#include <Python.h>
 
 #include "bpy_app_ocio.h"
 

source/blender/python/intern/bpy_app_oiio.c

@@ -18,8 +18,8 @@
  * \ingroup pythonintern
  */
 
-#include <Python.h>
 #include "BLI_utildefines.h"
+#include <Python.h>
 
 #include "bpy_app_oiio.h"
 

source/blender/python/intern/bpy_app_opensubdiv.c

@@ -18,8 +18,8 @@
  * \ingroup pythonintern
  */
 
-#include <Python.h>
 #include "BLI_utildefines.h"
+#include <Python.h>
 
 #include "bpy_app_opensubdiv.h"
 

source/blender/python/intern/bpy_app_openvdb.c

@@ -21,8 +21,8 @@
  * \ingroup pythonintern
  */
 
-#include <Python.h>
 #include "BLI_utildefines.h"
+#include <Python.h>
 
 #include "bpy_app_openvdb.h"
 

source/blender/python/intern/bpy_app_sdl.c

@@ -18,8 +18,8 @@
  * \ingroup pythonintern
  */
 
-#include <Python.h>
 #include "BLI_utildefines.h"
+#include <Python.h>
 
 #include "bpy_app_sdl.h"
 

source/blender/python/intern/bpy_app_timers.c

@@ -18,10 +18,10 @@
  * \ingroup pythonintern
  */
 
-#include <Python.h>
-#include "BLI_utildefines.h"
 #include "BLI_timer.h"
+#include "BLI_utildefines.h"
 #include "PIL_time.h"
+#include <Python.h>
 
 #include "BPY_extern.h"
 #include "bpy_app_timers.h"

source/blender/python/intern/bpy_app_translations.c

@@ -33,16 +33,16 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLT_translation.h"
 #include "BLT_lang.h"
+#include "BLT_translation.h"
 
 #include "RNA_types.h"
 
 #include "../generic/python_utildefines.h"
 
 #ifdef WITH_INTERNATIONAL
-#  include "BLI_string.h"
 #  include "BLI_ghash.h"
+#  include "BLI_string.h"
 #endif
 
 typedef struct {

source/blender/python/intern/bpy_app_usd.c

@@ -21,8 +21,8 @@
  * \ingroup pythonintern
  */
 
-#include <Python.h>
 #include "BLI_utildefines.h"
+#include <Python.h>
 
 #include "bpy_app_usd.h"
 

source/blender/python/intern/bpy_capi_utils.c

@@ -23,15 +23,15 @@
 
 #include <Python.h>
 
-#include "BLI_utildefines.h"
 #include "BLI_dynstr.h"
+#include "BLI_utildefines.h"
 
 #include "bpy_capi_utils.h"
 
 #include "MEM_guardedalloc.h"
 
-#include "BKE_report.h"
 #include "BKE_context.h"
+#include "BKE_report.h"
 
 #include "BLT_translation.h"
 

source/blender/python/intern/bpy_gizmo_wrap.c

@@ -37,9 +37,9 @@
 #include "RNA_define.h"
 #include "RNA_enum_types.h"
 
-#include "bpy_rna.h"
-#include "bpy_intern_string.h"
 #include "bpy_gizmo_wrap.h" /* own include */
+#include "bpy_intern_string.h"
+#include "bpy_rna.h"
 
 /* we may want to add, but not now */
 

source/blender/python/intern/bpy_interface.c

@@ -30,22 +30,22 @@
 
 #include "CLG_log.h"
 
-#include "BLI_utildefines.h"
-#include "BLI_path_util.h"
 #include "BLI_fileops.h"
 #include "BLI_listbase.h"
+#include "BLI_path_util.h"
 #include "BLI_string.h"
 #include "BLI_string_utf8.h"
 #include "BLI_threads.h"
+#include "BLI_utildefines.h"
 
 #include "RNA_types.h"
 
 #include "bpy.h"
-#include "bpy_rna.h"
-#include "bpy_path.h"
 #include "bpy_capi_utils.h"
-#include "bpy_traceback.h"
 #include "bpy_intern_string.h"
+#include "bpy_path.h"
+#include "bpy_rna.h"
+#include "bpy_traceback.h"
 
 #include "bpy_app_translations.h"
 
@@ -66,12 +66,12 @@
 #include "../generic/py_capi_utils.h"
 
 /* inittab initialization functions */
+#include "../bmesh/bmesh_py_api.h"
 #include "../generic/bgl.h"
 #include "../generic/blf_py_api.h"
 #include "../generic/idprop_py_api.h"
 #include "../generic/imbuf_py_api.h"
 #include "../gpu/gpu_py_api.h"
-#include "../bmesh/bmesh_py_api.h"
 #include "../mathutils/mathutils.h"
 
 /* Logging types to use anywhere in the Python modules. */

source/blender/python/intern/bpy_interface_atexit.c

@@ -26,8 +26,8 @@
 
 #include "BLI_utildefines.h"
 
-#include "bpy_capi_utils.h"
 #include "bpy.h" /* own include */
+#include "bpy_capi_utils.h"
 
 #include "WM_api.h"
 

source/blender/python/intern/bpy_library_load.c

@@ -28,11 +28,11 @@
 #include <Python.h>
 #include <stddef.h>
 
-#include "BLI_utildefines.h"
 #include "BLI_ghash.h"
-#include "BLI_string.h"
 #include "BLI_linklist.h"
 #include "BLI_path_util.h"
+#include "BLI_string.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 #include "BKE_idcode.h"
@@ -54,8 +54,8 @@
 #define USE_RNA_DATABLOCKS
 
 #ifdef USE_RNA_DATABLOCKS
-#  include "bpy_rna.h"
 #  include "RNA_access.h"
+#  include "bpy_rna.h"
 #endif
 
 typedef struct {

source/blender/python/intern/bpy_library_write.c

@@ -26,9 +26,9 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_utildefines.h"
-#include "BLI_string.h"
 #include "BLI_path_util.h"
+#include "BLI_string.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_blendfile.h"
 #include "BKE_global.h"
@@ -37,9 +37,9 @@
 
 #include "RNA_types.h"
 
-#include "bpy_rna.h"
 #include "bpy_capi_utils.h"
 #include "bpy_library.h"
+#include "bpy_rna.h"
 
 #include "../generic/py_capi_utils.h"
 

source/blender/python/intern/bpy_msgbus.c

@@ -21,8 +21,8 @@
 
 #include <Python.h>
 
-#include "../generic/python_utildefines.h"
 #include "../generic/py_capi_utils.h"
+#include "../generic/python_utildefines.h"
 #include "../mathutils/mathutils.h"
 
 #include "BLI_utildefines.h"
@@ -30,17 +30,17 @@
 #include "BKE_context.h"
 
 #include "WM_api.h"
-#include "WM_types.h"
 #include "WM_message.h"
+#include "WM_types.h"
 
 #include "RNA_access.h"
 #include "RNA_define.h"
 #include "RNA_enum_types.h"
 
 #include "bpy_capi_utils.h"
-#include "bpy_rna.h"
-#include "bpy_intern_string.h"
 #include "bpy_gizmo_wrap.h" /* own include */
+#include "bpy_intern_string.h"
+#include "bpy_rna.h"
 
 #include "bpy_msgbus.h" /* own include */
 

source/blender/python/intern/bpy_operator.c

@@ -29,16 +29,16 @@
 
 #include "RNA_types.h"
 
-#include "BLI_utildefines.h"
 #include "BLI_listbase.h"
+#include "BLI_utildefines.h"
 
+#include "../generic/py_capi_utils.h"
+#include "../generic/python_utildefines.h"
 #include "BPY_extern.h"
+#include "bpy_capi_utils.h"
 #include "bpy_operator.h"
 #include "bpy_operator_wrap.h"
 #include "bpy_rna.h" /* for setting arg props only - pyrna_py_to_prop() */
-#include "bpy_capi_utils.h"
-#include "../generic/py_capi_utils.h"
-#include "../generic/python_utildefines.h"
 
 #include "RNA_access.h"
 #include "RNA_enum_types.h"
@@ -50,8 +50,8 @@
 
 #include "BLI_ghash.h"
 
-#include "BKE_report.h"
 #include "BKE_context.h"
+#include "BKE_report.h"
 
 /* so operators called can spawn threads which acquire the GIL */
 #define BPY_RELEASE_GIL

source/blender/python/intern/bpy_operator_wrap.c

@@ -33,9 +33,9 @@
 #include "RNA_access.h"
 #include "RNA_define.h"
 
-#include "bpy_rna.h"
 #include "bpy_intern_string.h"
 #include "bpy_operator_wrap.h" /* own include */
+#include "bpy_rna.h"
 
 static void operator_properties_init(wmOperatorType *ot)
 {

source/blender/python/intern/bpy_props.c

@@ -31,9 +31,9 @@
 
 #include "BLI_utildefines.h"
 
+#include "bpy_capi_utils.h"
 #include "bpy_props.h"
 #include "bpy_rna.h"
-#include "bpy_capi_utils.h"
 
 #include "BKE_idprop.h"
 

source/blender/python/intern/bpy_rna.c

@@ -26,46 +26,46 @@
 
 #include <Python.h>
 
-#include <stddef.h>
 #include <float.h> /* FLT_MIN/MAX */
+#include <stddef.h>
 
 #include "RNA_types.h"
 
 #include "BLI_bitmap.h"
 #include "BLI_dynstr.h"
-#include "BLI_string.h"
 #include "BLI_listbase.h"
 #include "BLI_math_rotation.h"
+#include "BLI_string.h"
 #include "BLI_utildefines.h"
 
 #include "BPY_extern.h"
 #include "BPY_extern_clog.h"
 
+#include "bpy_capi_utils.h"
+#include "bpy_intern_string.h"
+#include "bpy_props.h"
 #include "bpy_rna.h"
 #include "bpy_rna_anim.h"
-#include "bpy_props.h"
-#include "bpy_capi_utils.h"
 #include "bpy_rna_callback.h"
-#include "bpy_intern_string.h"
 
 #ifdef USE_PYRNA_INVALIDATE_WEAKREF
 #  include "BLI_ghash.h"
 #endif
 
-#include "RNA_enum_types.h"
-#include "RNA_define.h" /* RNA_def_property_free_identifier */
 #include "RNA_access.h"
+#include "RNA_define.h" /* RNA_def_property_free_identifier */
+#include "RNA_enum_types.h"
 
 #include "CLG_log.h"
 
 #include "MEM_guardedalloc.h"
 
-#include "BKE_main.h"
-#include "BKE_idcode.h"
 #include "BKE_context.h"
 #include "BKE_global.h" /* evil G.* */
-#include "BKE_report.h"
+#include "BKE_idcode.h"
 #include "BKE_idprop.h"
+#include "BKE_main.h"
+#include "BKE_report.h"
 
 /* Only for types. */
 #include "BKE_node.h"

source/blender/python/intern/bpy_rna_anim.c

@@ -25,15 +25,15 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_utildefines.h"
 #include "BLI_string.h"
 #include "BLI_string_utils.h"
+#include "BLI_utildefines.h"
 
-#include "DNA_scene_types.h"
 #include "DNA_anim_types.h"
+#include "DNA_scene_types.h"
 
-#include "ED_keyframing.h"
 #include "ED_keyframes_edit.h"
+#include "ED_keyframing.h"
 
 #include "BKE_animsys.h"
 #include "BKE_context.h"
@@ -49,8 +49,8 @@
 #include "WM_api.h"
 #include "WM_types.h"
 
-#include "bpy_rna.h"
 #include "bpy_capi_utils.h"
+#include "bpy_rna.h"
 #include "bpy_rna_anim.h"
 
 #include "../generic/python_utildefines.h"

source/blender/python/intern/bpy_rna_callback.c

@@ -27,12 +27,12 @@
 
 #include "BLI_utildefines.h"
 
+#include "bpy_capi_utils.h"
 #include "bpy_rna.h"
 #include "bpy_rna_callback.h"
-#include "bpy_capi_utils.h"
 
-#include "DNA_space_types.h"
 #include "DNA_screen_types.h"
+#include "DNA_space_types.h"
 
 #include "RNA_access.h"
 #include "RNA_enum_types.h"

source/blender/python/intern/bpy_rna_gizmo.c

@@ -25,8 +25,8 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_utildefines.h"
 #include "BLI_alloca.h"
+#include "BLI_utildefines.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
@@ -38,8 +38,8 @@
 #include "../generic/python_utildefines.h"
 
 #include "RNA_access.h"
-#include "RNA_types.h"
 #include "RNA_enum_types.h"
+#include "RNA_types.h"
 
 #include "bpy_rna.h"
 

source/blender/python/intern/bpy_rna_id_collection.c

@@ -25,8 +25,8 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_utildefines.h"
 #include "BLI_bitmap.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_global.h"
 #include "BKE_lib_id.h"
@@ -36,8 +36,8 @@
 #include "DNA_ID.h"
 /* Those following are only to support hack of not listing some internal
  * 'backward' pointers in generated user_map. */
-#include "DNA_object_types.h"
 #include "DNA_key_types.h"
+#include "DNA_object_types.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
@@ -49,8 +49,8 @@
 #include "../generic/python_utildefines.h"
 
 #include "RNA_access.h"
-#include "RNA_types.h"
 #include "RNA_enum_types.h"
+#include "RNA_types.h"
 
 #include "bpy_rna.h"
 

source/blender/python/intern/bpy_traceback.c

@@ -24,8 +24,8 @@
 #include <Python.h>
 #include <frameobject.h>
 
-#include "BLI_utildefines.h"
 #include "BLI_path_util.h"
+#include "BLI_utildefines.h"
 #ifdef WIN32
 #  include "BLI_string.h" /* BLI_strcasecmp */
 #endif

source/blender/python/intern/bpy_utils_previews.c

@@ -28,12 +28,12 @@
 
 #include "BLI_utildefines.h"
 
-#include "RNA_types.h"
 #include "RNA_access.h"
+#include "RNA_types.h"
 
 #include "BPY_extern.h"
-#include "bpy_utils_previews.h"
 #include "bpy_rna.h"
+#include "bpy_utils_previews.h"
 
 #include "MEM_guardedalloc.h"
 

source/blender/python/intern/bpy_utils_units.c

@@ -27,8 +27,8 @@
 #include <Python.h>
 #include <structmember.h>
 
-#include "BLI_utildefines.h"
 #include "BLI_string.h"
+#include "BLI_utildefines.h"
 
 #include "bpy_utils_units.h"