diff options
author | Dalai Felinto <dalai@blender.org> | 2020-03-19 11:33:03 +0300 |
---|---|---|
committer | Dalai Felinto <dalai@blender.org> | 2020-03-19 11:33:58 +0300 |
commit | 2d1cce8331f3ecdfb8cb0c651e111ffac5dc7153 (patch) | |
tree | ec50d7bdca3901a6afcc986943011f08f9516307 /source/blender/python | |
parent | 008aaaa37841ca27d2bba80d8859336655cef455 (diff) |
Cleanup: `make format` after SortedIncludes change
Diffstat (limited to 'source/blender/python')
55 files changed, 122 insertions, 122 deletions
diff --git a/source/blender/python/bmesh/bmesh_py_api.c b/source/blender/python/bmesh/bmesh_py_api.c index 7f5b10e6759..c6fd4bf0644 100644 --- a/source/blender/python/bmesh/bmesh_py_api.c +++ b/source/blender/python/bmesh/bmesh_py_api.c @@ -30,13 +30,13 @@ #include "bmesh.h" #include "bmesh_py_types.h" -#include "bmesh_py_types_select.h" #include "bmesh_py_types_customdata.h" #include "bmesh_py_types_meshdata.h" +#include "bmesh_py_types_select.h" +#include "bmesh_py_geometry.h" #include "bmesh_py_ops.h" #include "bmesh_py_utils.h" -#include "bmesh_py_geometry.h" #include "BKE_editmesh.h" diff --git a/source/blender/python/bmesh/bmesh_py_geometry.c b/source/blender/python/bmesh/bmesh_py_geometry.c index 2429d2a4888..f5090cd568b 100644 --- a/source/blender/python/bmesh/bmesh_py_geometry.c +++ b/source/blender/python/bmesh/bmesh_py_geometry.c @@ -31,8 +31,8 @@ #include "../mathutils/mathutils.h" #include "bmesh.h" -#include "bmesh_py_types.h" #include "bmesh_py_geometry.h" /* own include */ +#include "bmesh_py_types.h" PyDoc_STRVAR(bpy_bm_geometry_intersect_face_point_doc, ".. method:: intersect_face_point(face, point)\n" diff --git a/source/blender/python/bmesh/bmesh_py_ops.c b/source/blender/python/bmesh/bmesh_py_ops.c index 4708736ca27..1eccfe06d15 100644 --- a/source/blender/python/bmesh/bmesh_py_ops.c +++ b/source/blender/python/bmesh/bmesh_py_ops.c @@ -26,15 +26,15 @@ #include <Python.h> -#include "BLI_utildefines.h" #include "BLI_dynstr.h" +#include "BLI_utildefines.h" #include "MEM_guardedalloc.h" #include "bmesh.h" -#include "bmesh_py_ops_call.h" #include "bmesh_py_ops.h" /* own include */ +#include "bmesh_py_ops_call.h" /* bmesh operator 'bmesh.ops.*' callable types * ******************************************* */ diff --git a/source/blender/python/bmesh/bmesh_py_ops_call.c b/source/blender/python/bmesh/bmesh_py_ops_call.c index f44fa2aeac3..b1e5c1c761b 100644 --- a/source/blender/python/bmesh/bmesh_py_ops_call.c +++ b/source/blender/python/bmesh/bmesh_py_ops_call.c @@ -37,8 +37,8 @@ #include "bmesh_py_types.h" -#include "../generic/python_utildefines.h" #include "../generic/py_capi_utils.h" +#include "../generic/python_utildefines.h" BLI_STATIC_ASSERT(sizeof(PyC_FlagSet) == sizeof(BMO_FlagSet), "size mismatch"); diff --git a/source/blender/python/bmesh/bmesh_py_types.c b/source/blender/python/bmesh/bmesh_py_types.c index 12ae18a5bf5..fccdfe7fbdc 100644 --- a/source/blender/python/bmesh/bmesh_py_types.c +++ b/source/blender/python/bmesh/bmesh_py_types.c @@ -24,9 +24,9 @@ #include "BLI_math.h" #include "BLI_sort.h" +#include "DNA_material_types.h" #include "DNA_mesh_types.h" #include "DNA_object_types.h" -#include "DNA_material_types.h" #include "BKE_customdata.h" #include "BKE_global.h" @@ -47,9 +47,9 @@ #include "../generic/python_utildefines.h" #include "bmesh_py_types.h" /* own include */ -#include "bmesh_py_types_select.h" #include "bmesh_py_types_customdata.h" #include "bmesh_py_types_meshdata.h" +#include "bmesh_py_types_select.h" static void bm_dealloc_editmode_warn(BPy_BMesh *self); diff --git a/source/blender/python/bmesh/bmesh_py_types_customdata.c b/source/blender/python/bmesh/bmesh_py_types_customdata.c index ce700849cf3..ffddfb4a7e1 100644 --- a/source/blender/python/bmesh/bmesh_py_types_customdata.c +++ b/source/blender/python/bmesh/bmesh_py_types_customdata.c @@ -26,8 +26,8 @@ #include <Python.h> -#include "BLI_utildefines.h" #include "BLI_math_vector.h" +#include "BLI_utildefines.h" #include "bmesh.h" @@ -35,9 +35,9 @@ #include "bmesh_py_types_customdata.h" #include "bmesh_py_types_meshdata.h" -#include "../mathutils/mathutils.h" -#include "../generic/python_utildefines.h" #include "../generic/py_capi_utils.h" +#include "../generic/python_utildefines.h" +#include "../mathutils/mathutils.h" #include "BKE_customdata.h" diff --git a/source/blender/python/bmesh/bmesh_py_types_meshdata.c b/source/blender/python/bmesh/bmesh_py_types_meshdata.c index 321fc20c792..82b6cf5c3d5 100644 --- a/source/blender/python/bmesh/bmesh_py_types_meshdata.c +++ b/source/blender/python/bmesh/bmesh_py_types_meshdata.c @@ -28,12 +28,12 @@ #include "../mathutils/mathutils.h" -#include "DNA_object_types.h" #include "DNA_meshdata_types.h" +#include "DNA_object_types.h" -#include "BLI_utildefines.h" #include "BLI_math_base.h" #include "BLI_math_vector.h" +#include "BLI_utildefines.h" #include "BKE_deform.h" diff --git a/source/blender/python/bmesh/bmesh_py_types_select.c b/source/blender/python/bmesh/bmesh_py_types_select.c index dc0cf59d38c..5e064453a04 100644 --- a/source/blender/python/bmesh/bmesh_py_types_select.c +++ b/source/blender/python/bmesh/bmesh_py_types_select.c @@ -29,8 +29,8 @@ #include <Python.h> -#include "BLI_utildefines.h" #include "BLI_listbase.h" +#include "BLI_utildefines.h" #include "bmesh.h" diff --git a/source/blender/python/bmesh/bmesh_py_utils.c b/source/blender/python/bmesh/bmesh_py_utils.c index 01f6cdf6e26..9b207693e37 100644 --- a/source/blender/python/bmesh/bmesh_py_utils.c +++ b/source/blender/python/bmesh/bmesh_py_utils.c @@ -26,8 +26,8 @@ #include <Python.h> -#include "BLI_utildefines.h" #include "BLI_math_base.h" +#include "BLI_utildefines.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/python/generic/blf_py_api.c b/source/blender/python/generic/blf_py_api.c index 269ff3b5d69..836f4f1a12c 100644 --- a/source/blender/python/generic/blf_py_api.c +++ b/source/blender/python/generic/blf_py_api.c @@ -23,8 +23,8 @@ /* Future-proof, See https://docs.python.org/3/c-api/arg.html#strings-and-buffers */ #define PY_SSIZE_T_CLEAN -#include <Python.h> #include "blf_py_api.h" +#include <Python.h> #include "../../blenfont/BLF_api.h" diff --git a/source/blender/python/generic/bpy_threads.c b/source/blender/python/generic/bpy_threads.c index 2474b08180f..1aa36a0e685 100644 --- a/source/blender/python/generic/bpy_threads.c +++ b/source/blender/python/generic/bpy_threads.c @@ -23,8 +23,8 @@ #include <Python.h> -#include "BLI_utildefines.h" #include "../BPY_extern.h" +#include "BLI_utildefines.h" /* analogue of PyEval_SaveThread() */ BPy_ThreadStatePtr BPY_thread_save(void) diff --git a/source/blender/python/generic/imbuf_py_api.c b/source/blender/python/generic/imbuf_py_api.c index 32fe522b84d..8a02638786d 100644 --- a/source/blender/python/generic/imbuf_py_api.c +++ b/source/blender/python/generic/imbuf_py_api.c @@ -22,9 +22,9 @@ #include <Python.h> -#include "BLI_utildefines.h" -#include "BLI_string.h" #include "BLI_rect.h" +#include "BLI_string.h" +#include "BLI_utildefines.h" #include "py_capi_utils.h" @@ -36,9 +36,9 @@ #include "../../imbuf/IMB_imbuf_types.h" /* File IO */ -#include <fcntl.h> -#include <errno.h> #include "BLI_fileops.h" +#include <errno.h> +#include <fcntl.h> static PyObject *Py_ImBuf_CreatePyObject(ImBuf *ibuf); diff --git a/source/blender/python/gpu/gpu_py_batch.c b/source/blender/python/gpu/gpu_py_batch.c index f147b7de01d..b3df991cf12 100644 --- a/source/blender/python/gpu/gpu_py_batch.c +++ b/source/blender/python/gpu/gpu_py_batch.c @@ -39,10 +39,10 @@ #include "../generic/py_capi_utils.h" #include "gpu_py_api.h" +#include "gpu_py_batch.h" /* own include */ +#include "gpu_py_element.h" #include "gpu_py_shader.h" #include "gpu_py_vertex_buffer.h" -#include "gpu_py_element.h" -#include "gpu_py_batch.h" /* own include */ /* -------------------------------------------------------------------- */ /** \name Utility Functions diff --git a/source/blender/python/gpu/gpu_py_offscreen.c b/source/blender/python/gpu/gpu_py_offscreen.c index f128c46ec05..280f09d67c9 100644 --- a/source/blender/python/gpu/gpu_py_offscreen.c +++ b/source/blender/python/gpu/gpu_py_offscreen.c @@ -36,8 +36,8 @@ #include "BKE_lib_id.h" #include "BKE_scene.h" -#include "DNA_screen_types.h" #include "DNA_scene_types.h" +#include "DNA_screen_types.h" #include "DNA_view3d_types.h" #include "GPU_framebuffer.h" diff --git a/source/blender/python/gpu/gpu_py_types.h b/source/blender/python/gpu/gpu_py_types.h index 7e73f5b9084..d8048225604 100644 --- a/source/blender/python/gpu/gpu_py_types.h +++ b/source/blender/python/gpu/gpu_py_types.h @@ -21,12 +21,12 @@ #ifndef __GPU_PY_TYPES_H__ #define __GPU_PY_TYPES_H__ -#include "gpu_py_vertex_format.h" -#include "gpu_py_vertex_buffer.h" -#include "gpu_py_element.h" #include "gpu_py_batch.h" +#include "gpu_py_element.h" #include "gpu_py_offscreen.h" #include "gpu_py_shader.h" +#include "gpu_py_vertex_buffer.h" +#include "gpu_py_vertex_format.h" PyObject *BPyInit_gpu_types(void); diff --git a/source/blender/python/gpu/gpu_py_vertex_buffer.c b/source/blender/python/gpu/gpu_py_vertex_buffer.c index 9760c12d89f..57290fdc3c4 100644 --- a/source/blender/python/gpu/gpu_py_vertex_buffer.c +++ b/source/blender/python/gpu/gpu_py_vertex_buffer.c @@ -32,8 +32,8 @@ #include "../generic/py_capi_utils.h" #include "../generic/python_utildefines.h" -#include "gpu_py_vertex_format.h" #include "gpu_py_vertex_buffer.h" /* own include */ +#include "gpu_py_vertex_format.h" /* -------------------------------------------------------------------- */ /** \name Utility Functions diff --git a/source/blender/python/intern/bpy.c b/source/blender/python/intern/bpy.c index 52b35478dd0..5a36535f3e3 100644 --- a/source/blender/python/intern/bpy.c +++ b/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" diff --git a/source/blender/python/intern/bpy_app.c b/source/blender/python/intern/bpy_app.c index 9b7842460b5..a9bdef1c3e4 100644 --- a/source/blender/python/intern/bpy_app.c +++ b/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" diff --git a/source/blender/python/intern/bpy_app_alembic.c b/source/blender/python/intern/bpy_app_alembic.c index c02bb546553..dc7632baeef 100644 --- a/source/blender/python/intern/bpy_app_alembic.c +++ b/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" diff --git a/source/blender/python/intern/bpy_app_ffmpeg.c b/source/blender/python/intern/bpy_app_ffmpeg.c index 7f12f7be7ab..193b0385044 100644 --- a/source/blender/python/intern/bpy_app_ffmpeg.c +++ b/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" diff --git a/source/blender/python/intern/bpy_app_handlers.c b/source/blender/python/intern/bpy_app_handlers.c index 01618f0184a..28498e116df 100644 --- a/source/blender/python/intern/bpy_app_handlers.c +++ b/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" diff --git a/source/blender/python/intern/bpy_app_ocio.c b/source/blender/python/intern/bpy_app_ocio.c index 750fe93d1de..bbfc734a77f 100644 --- a/source/blender/python/intern/bpy_app_ocio.c +++ b/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" diff --git a/source/blender/python/intern/bpy_app_oiio.c b/source/blender/python/intern/bpy_app_oiio.c index 44ffce2ad07..1f65641606d 100644 --- a/source/blender/python/intern/bpy_app_oiio.c +++ b/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" diff --git a/source/blender/python/intern/bpy_app_opensubdiv.c b/source/blender/python/intern/bpy_app_opensubdiv.c index 2b3c2f18e43..3f14c4dca57 100644 --- a/source/blender/python/intern/bpy_app_opensubdiv.c +++ b/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" diff --git a/source/blender/python/intern/bpy_app_openvdb.c b/source/blender/python/intern/bpy_app_openvdb.c index 80732b7fecb..9958029dd0a 100644 --- a/source/blender/python/intern/bpy_app_openvdb.c +++ b/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" diff --git a/source/blender/python/intern/bpy_app_sdl.c b/source/blender/python/intern/bpy_app_sdl.c index 1bc3d07473a..a3f9fdc67c1 100644 --- a/source/blender/python/intern/bpy_app_sdl.c +++ b/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" diff --git a/source/blender/python/intern/bpy_app_timers.c b/source/blender/python/intern/bpy_app_timers.c index c3c56e4fb66..f1dd8b9e803 100644 --- a/source/blender/python/intern/bpy_app_timers.c +++ b/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" diff --git a/source/blender/python/intern/bpy_app_translations.c b/source/blender/python/intern/bpy_app_translations.c index 54699663b91..cf4550089ba 100644 --- a/source/blender/python/intern/bpy_app_translations.c +++ b/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 { diff --git a/source/blender/python/intern/bpy_app_usd.c b/source/blender/python/intern/bpy_app_usd.c index d87d218a5e5..d60264ef259 100644 --- a/source/blender/python/intern/bpy_app_usd.c +++ b/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" diff --git a/source/blender/python/intern/bpy_capi_utils.c b/source/blender/python/intern/bpy_capi_utils.c index 2ff357896d5..f63b77e1726 100644 --- a/source/blender/python/intern/bpy_capi_utils.c +++ b/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" diff --git a/source/blender/python/intern/bpy_gizmo_wrap.c b/source/blender/python/intern/bpy_gizmo_wrap.c index c66cad5f4a3..8ff3af59930 100644 --- a/source/blender/python/intern/bpy_gizmo_wrap.c +++ b/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 */ diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c index 1e1a070208c..fdf7e127af9 100644 --- a/source/blender/python/intern/bpy_interface.c +++ b/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. */ diff --git a/source/blender/python/intern/bpy_interface_atexit.c b/source/blender/python/intern/bpy_interface_atexit.c index 4a43d4e6853..e69914671dd 100644 --- a/source/blender/python/intern/bpy_interface_atexit.c +++ b/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" diff --git a/source/blender/python/intern/bpy_library_load.c b/source/blender/python/intern/bpy_library_load.c index 95f0daae862..14a4482f570 100644 --- a/source/blender/python/intern/bpy_library_load.c +++ b/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 { diff --git a/source/blender/python/intern/bpy_library_write.c b/source/blender/python/intern/bpy_library_write.c index a1894b7f000..6c8f1deb126 100644 --- a/source/blender/python/intern/bpy_library_write.c +++ b/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" diff --git a/source/blender/python/intern/bpy_msgbus.c b/source/blender/python/intern/bpy_msgbus.c index 3d98a3879a3..c068182fe27 100644 --- a/source/blender/python/intern/bpy_msgbus.c +++ b/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 */ diff --git a/source/blender/python/intern/bpy_operator.c b/source/blender/python/intern/bpy_operator.c index 5e3b000c604..4b2b5f129a7 100644 --- a/source/blender/python/intern/bpy_operator.c +++ b/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 diff --git a/source/blender/python/intern/bpy_operator_wrap.c b/source/blender/python/intern/bpy_operator_wrap.c index 2e88a2a5b06..b7d3c99d3da 100644 --- a/source/blender/python/intern/bpy_operator_wrap.c +++ b/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) { diff --git a/source/blender/python/intern/bpy_props.c b/source/blender/python/intern/bpy_props.c index 4fd81a707fb..ade02780210 100644 --- a/source/blender/python/intern/bpy_props.c +++ b/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" diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c index 92230ece35e..8ec62c24c5f 100644 --- a/source/blender/python/intern/bpy_rna.c +++ b/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" diff --git a/source/blender/python/intern/bpy_rna_anim.c b/source/blender/python/intern/bpy_rna_anim.c index d41ec59188c..0c640329efa 100644 --- a/source/blender/python/intern/bpy_rna_anim.c +++ b/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" diff --git a/source/blender/python/intern/bpy_rna_callback.c b/source/blender/python/intern/bpy_rna_callback.c index b321a482b1d..cc9f5746bba 100644 --- a/source/blender/python/intern/bpy_rna_callback.c +++ b/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" diff --git a/source/blender/python/intern/bpy_rna_gizmo.c b/source/blender/python/intern/bpy_rna_gizmo.c index ec041b3054a..aff81c68358 100644 --- a/source/blender/python/intern/bpy_rna_gizmo.c +++ b/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" diff --git a/source/blender/python/intern/bpy_rna_id_collection.c b/source/blender/python/intern/bpy_rna_id_collection.c index 6344ed39b1b..6b6ffa97995 100644 --- a/source/blender/python/intern/bpy_rna_id_collection.c +++ b/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" diff --git a/source/blender/python/intern/bpy_traceback.c b/source/blender/python/intern/bpy_traceback.c index 911e91e9e0f..e92a0b788ea 100644 --- a/source/blender/python/intern/bpy_traceback.c +++ b/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 diff --git a/source/blender/python/intern/bpy_utils_previews.c b/source/blender/python/intern/bpy_utils_previews.c index 7423e55d253..81b44dd5c43 100644 --- a/source/blender/python/intern/bpy_utils_previews.c +++ b/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" diff --git a/source/blender/python/intern/bpy_utils_units.c b/source/blender/python/intern/bpy_utils_units.c index fb9a28be430..4433f5d0f88 100644 --- a/source/blender/python/intern/bpy_utils_units.c +++ b/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" diff --git a/source/blender/python/mathutils/mathutils.h b/source/blender/python/mathutils/mathutils.h index 70bd3a64481..c59fa75b651 100644 --- a/source/blender/python/mathutils/mathutils.h +++ b/source/blender/python/mathutils/mathutils.h @@ -69,11 +69,11 @@ typedef struct { } BaseMathObject; /* types */ -#include "mathutils_Vector.h" +#include "mathutils_Color.h" +#include "mathutils_Euler.h" #include "mathutils_Matrix.h" #include "mathutils_Quaternion.h" -#include "mathutils_Euler.h" -#include "mathutils_Color.h" +#include "mathutils_Vector.h" /* avoid checking all types */ #define BaseMathObject_CheckExact(v) (Py_TYPE(v)->tp_dealloc == (destructor)BaseMathObject_dealloc) diff --git a/source/blender/python/mathutils/mathutils_Color.c b/source/blender/python/mathutils/mathutils_Color.c index bf7fe0472d0..08dede8ff78 100644 --- a/source/blender/python/mathutils/mathutils_Color.c +++ b/source/blender/python/mathutils/mathutils_Color.c @@ -25,8 +25,8 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#include "../generic/python_utildefines.h" #include "../generic/py_capi_utils.h" +#include "../generic/python_utildefines.h" #ifndef MATH_STANDALONE # include "BLI_dynstr.h" diff --git a/source/blender/python/mathutils/mathutils_Euler.c b/source/blender/python/mathutils/mathutils_Euler.c index 4375ba31439..7ece587e38f 100644 --- a/source/blender/python/mathutils/mathutils_Euler.c +++ b/source/blender/python/mathutils/mathutils_Euler.c @@ -22,10 +22,10 @@ #include "mathutils.h" +#include "../generic/py_capi_utils.h" +#include "../generic/python_utildefines.h" #include "BLI_math.h" #include "BLI_utildefines.h" -#include "../generic/python_utildefines.h" -#include "../generic/py_capi_utils.h" #ifndef MATH_STANDALONE # include "BLI_dynstr.h" diff --git a/source/blender/python/mathutils/mathutils_Matrix.c b/source/blender/python/mathutils/mathutils_Matrix.c index 352d8326901..7a3a92d8a10 100644 --- a/source/blender/python/mathutils/mathutils_Matrix.c +++ b/source/blender/python/mathutils/mathutils_Matrix.c @@ -25,12 +25,12 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#include "../generic/python_utildefines.h" #include "../generic/py_capi_utils.h" +#include "../generic/python_utildefines.h" #ifndef MATH_STANDALONE -# include "BLI_string.h" # include "BLI_dynstr.h" +# include "BLI_string.h" #endif typedef enum eMatrixAccess_t { diff --git a/source/blender/python/mathutils/mathutils_Quaternion.c b/source/blender/python/mathutils/mathutils_Quaternion.c index 6a2a1161ca9..39d84c1ac96 100644 --- a/source/blender/python/mathutils/mathutils_Quaternion.c +++ b/source/blender/python/mathutils/mathutils_Quaternion.c @@ -25,8 +25,8 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#include "../generic/python_utildefines.h" #include "../generic/py_capi_utils.h" +#include "../generic/python_utildefines.h" #ifndef MATH_STANDALONE # include "BLI_dynstr.h" diff --git a/source/blender/python/mathutils/mathutils_bvhtree.c b/source/blender/python/mathutils/mathutils_bvhtree.c index ad88bd8cd84..5a0dc7d6a5e 100644 --- a/source/blender/python/mathutils/mathutils_bvhtree.c +++ b/source/blender/python/mathutils/mathutils_bvhtree.c @@ -25,12 +25,12 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" +#include "BLI_ghash.h" #include "BLI_kdopbvh.h" -#include "BLI_polyfill_2d.h" #include "BLI_math.h" -#include "BLI_ghash.h" #include "BLI_memarena.h" +#include "BLI_polyfill_2d.h" +#include "BLI_utildefines.h" #include "BKE_bvhutils.h" @@ -41,9 +41,9 @@ #include "mathutils_bvhtree.h" /* own include */ #ifndef MATH_STANDALONE -# include "DNA_object_types.h" # include "DNA_mesh_types.h" # include "DNA_meshdata_types.h" +# include "DNA_object_types.h" # include "BKE_customdata.h" # include "BKE_editmesh_bvh.h" diff --git a/source/blender/python/mathutils/mathutils_geometry.c b/source/blender/python/mathutils/mathutils_geometry.c index 6474275ecaf..105cf96a17e 100644 --- a/source/blender/python/mathutils/mathutils_geometry.c +++ b/source/blender/python/mathutils/mathutils_geometry.c @@ -25,13 +25,13 @@ /* Used for PolyFill */ #ifndef MATH_STANDALONE /* define when building outside blender */ -# include "MEM_guardedalloc.h" +# include "BKE_curve.h" +# include "BKE_displist.h" # include "BLI_blenlib.h" # include "BLI_boxpack_2d.h" # include "BLI_convexhull_2d.h" # include "BLI_delaunay_2d.h" -# include "BKE_displist.h" -# include "BKE_curve.h" +# include "MEM_guardedalloc.h" #endif #include "BLI_math.h" diff --git a/source/blender/python/mathutils/mathutils_kdtree.c b/source/blender/python/mathutils/mathutils_kdtree.c index ec35d25bdd5..c3e66546dae 100644 --- a/source/blender/python/mathutils/mathutils_kdtree.c +++ b/source/blender/python/mathutils/mathutils_kdtree.c @@ -25,8 +25,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_kdtree.h" +#include "BLI_utildefines.h" #include "../generic/py_capi_utils.h" #include "../generic/python_utildefines.h" |