From 65701599290292a0e57c005f45c7dfa0c3333177 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 24 Jun 2021 17:10:22 +1000 Subject: Cleanup: update clang-format so PyObject_HEAD indents properly --- source/blender/python/intern/bpy_app_translations.c | 4 ++-- source/blender/python/intern/bpy_interface.c | 4 ++-- source/blender/python/intern/bpy_interface_run.c | 3 ++- source/blender/python/intern/bpy_library_load.c | 4 ++-- source/blender/python/intern/bpy_props.h | 4 ++-- source/blender/python/intern/bpy_rna.h | 12 ++++++------ source/blender/python/intern/bpy_rna_data.c | 2 +- 7 files changed, 17 insertions(+), 16 deletions(-) (limited to 'source/blender/python/intern') diff --git a/source/blender/python/intern/bpy_app_translations.c b/source/blender/python/intern/bpy_app_translations.c index f2a564cbb49..478ae61aecd 100644 --- a/source/blender/python/intern/bpy_app_translations.c +++ b/source/blender/python/intern/bpy_app_translations.c @@ -51,8 +51,8 @@ typedef struct { PyObject_HEAD - /** The string used to separate context from actual message in PY_TRANSLATE RNA props. */ - const char *context_separator; + /** The string used to separate context from actual message in PY_TRANSLATE RNA props. */ + const char *context_separator; /** A "named tuple" (StructSequence actually...) containing all C-defined contexts. */ PyObject *contexts; /** A readonly mapping {C context id: python id} (actually, a MappingProxy). */ diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c index f294f092536..832af9e8460 100644 --- a/source/blender/python/intern/bpy_interface.c +++ b/source/blender/python/intern/bpy_interface.c @@ -785,8 +785,8 @@ static struct PyModuleDef bpy_proxy_def = { typedef struct { PyObject_HEAD - /* Type-specific fields go here. */ - PyObject *mod; + /* Type-specific fields go here. */ + PyObject *mod; } dealloc_obj; /* call once __file__ is set */ diff --git a/source/blender/python/intern/bpy_interface_run.c b/source/blender/python/intern/bpy_interface_run.c index f7272a87a17..f7d6a33c904 100644 --- a/source/blender/python/intern/bpy_interface_run.c +++ b/source/blender/python/intern/bpy_interface_run.c @@ -74,7 +74,8 @@ static void bpy_text_filename_get(char *fn, const Main *bmain, size_t fn_len, co /* bad!, we should never do this, but currently only safe way I could find to keep namespace. * from being cleared. - campbell */ typedef struct { - PyObject_HEAD PyObject *md_dict; + PyObject_HEAD + PyObject *md_dict; /* omit other values, we only want the dict. */ } PyModuleObject; #endif diff --git a/source/blender/python/intern/bpy_library_load.c b/source/blender/python/intern/bpy_library_load.c index 70f78c25052..2350152f07f 100644 --- a/source/blender/python/intern/bpy_library_load.c +++ b/source/blender/python/intern/bpy_library_load.c @@ -62,8 +62,8 @@ typedef struct { PyObject_HEAD /* Required Python macro. */ - /* Collection iterator specific parts. */ - char relpath[FILE_MAX]; + /* Collection iterator specific parts. */ + char relpath[FILE_MAX]; char abspath[FILE_MAX]; /* absolute path */ BlendHandle *blo_handle; int flag; diff --git a/source/blender/python/intern/bpy_props.h b/source/blender/python/intern/bpy_props.h index d467166f354..bc7f0cfe416 100644 --- a/source/blender/python/intern/bpy_props.h +++ b/source/blender/python/intern/bpy_props.h @@ -33,8 +33,8 @@ StructRNA *pointer_type_from_py(PyObject *value, const char *error_prefix); typedef struct { PyObject_HEAD - /* This isn't GC tracked, it's a function from `bpy.props` so it's not going away. */ - void *fn; + /* This isn't GC tracked, it's a function from `bpy.props` so it's not going away. */ + void *fn; PyObject *kw; } BPy_PropDeferred; diff --git a/source/blender/python/intern/bpy_rna.h b/source/blender/python/intern/bpy_rna.h index 0f7e06354f4..c20ceaee4db 100644 --- a/source/blender/python/intern/bpy_rna.h +++ b/source/blender/python/intern/bpy_rna.h @@ -112,7 +112,7 @@ extern PyTypeObject pyrna_func_Type; typedef struct { PyObject_HEAD /* Required Python macro. */ #ifdef USE_WEAKREFS - PyObject *in_weakreflist; + PyObject *in_weakreflist; #endif PointerRNA ptr; } BPy_DummyPointerRNA; @@ -120,7 +120,7 @@ typedef struct { typedef struct { PyObject_HEAD /* Required Python macro. */ #ifdef USE_WEAKREFS - PyObject *in_weakreflist; + PyObject *in_weakreflist; #endif PointerRNA ptr; #ifdef USE_PYRNA_STRUCT_REFERENCE @@ -137,7 +137,7 @@ typedef struct { typedef struct { PyObject_HEAD /* Required Python macro. */ #ifdef USE_WEAKREFS - PyObject *in_weakreflist; + PyObject *in_weakreflist; #endif PointerRNA ptr; PropertyRNA *prop; @@ -146,7 +146,7 @@ typedef struct { typedef struct { PyObject_HEAD /* Required Python macro. */ #ifdef USE_WEAKREFS - PyObject *in_weakreflist; + PyObject *in_weakreflist; #endif PointerRNA ptr; PropertyRNA *prop; @@ -161,7 +161,7 @@ typedef struct { typedef struct { PyObject_HEAD /* Required Python macro. */ #ifdef USE_WEAKREFS - PyObject *in_weakreflist; + PyObject *in_weakreflist; #endif /* collection iterator specific parts */ @@ -171,7 +171,7 @@ typedef struct { typedef struct { PyObject_HEAD /* Required Python macro. */ #ifdef USE_WEAKREFS - PyObject *in_weakreflist; + PyObject *in_weakreflist; #endif PointerRNA ptr; FunctionRNA *func; diff --git a/source/blender/python/intern/bpy_rna_data.c b/source/blender/python/intern/bpy_rna_data.c index 2b2460ba7ba..639999b69d4 100644 --- a/source/blender/python/intern/bpy_rna_data.c +++ b/source/blender/python/intern/bpy_rna_data.c @@ -41,7 +41,7 @@ typedef struct { PyObject_HEAD /* Required Python macro. */ - BPy_StructRNA *data_rna; + BPy_StructRNA *data_rna; char filepath[1024]; } BPy_DataContext; -- cgit v1.2.3