[Bf-blender-cvs] [d5c6485372f] master: Cleanup: clang format
Campbell Barton
noreply at git.blender.org
Thu Apr 1 02:20:44 CEST 2021
Commit: d5c6485372f5f01a3505dc331ebdab03cde353d0
Author: Campbell Barton
Date: Thu Apr 1 11:15:47 2021 +1100
Branches: master
https://developer.blender.org/rBd5c6485372f5f01a3505dc331ebdab03cde353d0
Cleanup: clang format
===================================================================
M source/blender/editors/space_outliner/outliner_dragdrop.c
M source/blender/python/bmesh/bmesh_py_types.h
M source/blender/python/bmesh/bmesh_py_types_customdata.h
M source/blender/python/bmesh/bmesh_py_types_meshdata.c
M source/blender/python/bmesh/bmesh_py_types_meshdata.h
M source/blender/python/bmesh/bmesh_py_types_select.h
M source/blender/python/generic/bgl.h
M source/blender/python/generic/idprop_py_api.h
M source/blender/python/generic/imbuf_py_api.c
M source/blender/python/gpu/gpu_py_batch.h
M source/blender/python/gpu/gpu_py_buffer.h
M source/blender/python/gpu/gpu_py_element.h
M source/blender/python/gpu/gpu_py_shader.h
M source/blender/python/gpu/gpu_py_vertex_buffer.h
M source/blender/python/gpu/gpu_py_vertex_format.h
M source/blender/python/mathutils/mathutils.h
===================================================================
diff --git a/source/blender/editors/space_outliner/outliner_dragdrop.c b/source/blender/editors/space_outliner/outliner_dragdrop.c
index 83f71292232..8e19f76ea16 100644
--- a/source/blender/editors/space_outliner/outliner_dragdrop.c
+++ b/source/blender/editors/space_outliner/outliner_dragdrop.c
@@ -1104,7 +1104,7 @@ static bool collection_drop_init(bContext *C,
const wmEvent *event,
CollectionDrop *data)
{
-/* Get collection to drop into. */
+ /* Get collection to drop into. */
TreeElementInsertType insert_type;
TreeElement *te = outliner_drop_insert_collection_find(C, event, &insert_type);
if (!te) {
diff --git a/source/blender/python/bmesh/bmesh_py_types.h b/source/blender/python/bmesh/bmesh_py_types.h
index ce894760eff..ed307ce59a0 100644
--- a/source/blender/python/bmesh/bmesh_py_types.h
+++ b/source/blender/python/bmesh/bmesh_py_types.h
@@ -53,38 +53,45 @@ extern PyTypeObject BPy_BMIter_Type;
/* cast from _any_ bmesh type - they all have BMesh first */
typedef struct BPy_BMGeneric {
- PyObject_VAR_HEAD struct BMesh *bm; /* keep first */
+ PyObject_VAR_HEAD
+ struct BMesh *bm; /* keep first */
} BPy_BMGeneric;
/* BPy_BMVert/BPy_BMEdge/BPy_BMFace/BPy_BMLoop can cast to this */
typedef struct BPy_BMElem {
- PyObject_VAR_HEAD struct BMesh *bm; /* keep first */
+ PyObject_VAR_HEAD
+ struct BMesh *bm; /* keep first */
struct BMElem *ele;
} BPy_BMElem;
typedef struct BPy_BMesh {
- PyObject_VAR_HEAD struct BMesh *bm; /* keep first */
+ PyObject_VAR_HEAD
+ struct BMesh *bm; /* keep first */
int flag;
} BPy_BMesh;
/* element types */
typedef struct BPy_BMVert {
- PyObject_VAR_HEAD struct BMesh *bm; /* keep first */
+ PyObject_VAR_HEAD
+ struct BMesh *bm; /* keep first */
struct BMVert *v;
} BPy_BMVert;
typedef struct BPy_BMEdge {
- PyObject_VAR_HEAD struct BMesh *bm; /* keep first */
+ PyObject_VAR_HEAD
+ struct BMesh *bm; /* keep first */
struct BMEdge *e;
} BPy_BMEdge;
typedef struct BPy_BMFace {
- PyObject_VAR_HEAD struct BMesh *bm; /* keep first */
+ PyObject_VAR_HEAD
+ struct BMesh *bm; /* keep first */
struct BMFace *f;
} BPy_BMFace;
typedef struct BPy_BMLoop {
- PyObject_VAR_HEAD struct BMesh *bm; /* keep first */
+ PyObject_VAR_HEAD
+ struct BMesh *bm; /* keep first */
struct BMLoop *l;
} BPy_BMLoop;
@@ -98,7 +105,8 @@ typedef struct BPy_BMLoop {
* - BPy_BMLoopSeq_Type
*/
typedef struct BPy_BMElemSeq {
- PyObject_VAR_HEAD struct BMesh *bm; /* keep first */
+ PyObject_VAR_HEAD
+ struct BMesh *bm; /* keep first */
/* if this is a sequence on an existing element,
* loops of faces for eg.
@@ -114,7 +122,8 @@ typedef struct BPy_BMElemSeq {
} BPy_BMElemSeq;
typedef struct BPy_BMIter {
- PyObject_VAR_HEAD struct BMesh *bm; /* keep first */
+ PyObject_VAR_HEAD
+ struct BMesh *bm; /* keep first */
BMIter iter;
} BPy_BMIter;
diff --git a/source/blender/python/bmesh/bmesh_py_types_customdata.h b/source/blender/python/bmesh/bmesh_py_types_customdata.h
index 3173813a912..8552942f73a 100644
--- a/source/blender/python/bmesh/bmesh_py_types_customdata.h
+++ b/source/blender/python/bmesh/bmesh_py_types_customdata.h
@@ -38,20 +38,23 @@ extern PyTypeObject BPy_BMLayerItem_Type;
/* all layers for vert/edge/face/loop */
typedef struct BPy_BMLayerAccess {
- PyObject_VAR_HEAD struct BMesh *bm; /* keep first */
+ PyObject_VAR_HEAD
+ struct BMesh *bm; /* keep first */
char htype;
} BPy_BMLayerAccess;
/* access different layer types deform/uv/vertexcolor */
typedef struct BPy_BMLayerCollection {
- PyObject_VAR_HEAD struct BMesh *bm; /* keep first */
+ PyObject_VAR_HEAD
+ struct BMesh *bm; /* keep first */
char htype;
int type; /* customdata type - CD_XXX */
} BPy_BMLayerCollection;
/* access a specific layer directly */
typedef struct BPy_BMLayerItem {
- PyObject_VAR_HEAD struct BMesh *bm; /* keep first */
+ PyObject_VAR_HEAD
+ struct BMesh *bm; /* keep first */
char htype;
int type; /* customdata type - CD_XXX */
int index; /* index of this layer type */
diff --git a/source/blender/python/bmesh/bmesh_py_types_meshdata.c b/source/blender/python/bmesh/bmesh_py_types_meshdata.c
index 127ce7db503..84267a83a44 100644
--- a/source/blender/python/bmesh/bmesh_py_types_meshdata.c
+++ b/source/blender/python/bmesh/bmesh_py_types_meshdata.c
@@ -48,7 +48,8 @@
#define BPy_BMLoopUV_Check(v) (Py_TYPE(v) == &BPy_BMLoopUV_Type)
typedef struct BPy_BMLoopUV {
- PyObject_VAR_HEAD MLoopUV *data;
+ PyObject_VAR_HEAD
+ MLoopUV *data;
} BPy_BMLoopUV;
PyDoc_STRVAR(bpy_bmloopuv_uv_doc,
@@ -155,7 +156,8 @@ PyObject *BPy_BMLoopUV_CreatePyObject(struct MLoopUV *mloopuv)
#define BPy_BMVertSkin_Check(v) (Py_TYPE(v) == &BPy_BMVertSkin_Type)
typedef struct BPy_BMVertSkin {
- PyObject_VAR_HEAD MVertSkin *data;
+ PyObject_VAR_HEAD
+ MVertSkin *data;
} BPy_BMVertSkin;
PyDoc_STRVAR(bpy_bmvertskin_radius_doc,
@@ -392,7 +394,8 @@ PyObject *BPy_BMLoopColor_CreatePyObject(struct MLoopCol *mloopcol)
#define BPy_BMDeformVert_Check(v) (Py_TYPE(v) == &BPy_BMDeformVert_Type)
typedef struct BPy_BMDeformVert {
- PyObject_VAR_HEAD MDeformVert *data;
+ PyObject_VAR_HEAD
+ MDeformVert *data;
} BPy_BMDeformVert;
/* Mapping Protocols
diff --git a/source/blender/python/bmesh/bmesh_py_types_meshdata.h b/source/blender/python/bmesh/bmesh_py_types_meshdata.h
index b7699b387e5..426bfcef6a0 100644
--- a/source/blender/python/bmesh/bmesh_py_types_meshdata.h
+++ b/source/blender/python/bmesh/bmesh_py_types_meshdata.h
@@ -29,7 +29,8 @@ extern PyTypeObject BPy_BMDeformVert_Type;
#define BPy_BMLoopUV_Check(v) (Py_TYPE(v) == &BPy_BMLoopUV_Type)
typedef struct BPy_BMGenericMeshData {
- PyObject_VAR_HEAD void *data;
+ PyObject_VAR_HEAD
+ void *data;
} BPy_BMGenericMeshData;
struct MDeformVert;
diff --git a/source/blender/python/bmesh/bmesh_py_types_select.h b/source/blender/python/bmesh/bmesh_py_types_select.h
index c33aa3675c5..34ca162dd09 100644
--- a/source/blender/python/bmesh/bmesh_py_types_select.h
+++ b/source/blender/python/bmesh/bmesh_py_types_select.h
@@ -32,11 +32,13 @@ extern PyTypeObject BPy_BMEditSelIter_Type;
#define BPy_BMSelectHistoryIter_Check(v) (Py_TYPE(v) == &BPy_BMEditSelIter_Type)
typedef struct BPy_BMEditSelSeq {
- PyObject_VAR_HEAD struct BMesh *bm; /* keep first */
+ PyObject_VAR_HEAD
+ struct BMesh *bm; /* keep first */
} BPy_BMEditSelSeq;
typedef struct BPy_BMEditSelIter {
- PyObject_VAR_HEAD struct BMesh *bm; /* keep first */
+ PyObject_VAR_HEAD
+ struct BMesh *bm; /* keep first */
struct BMEditSelection *ese;
} BPy_BMEditSelIter;
diff --git a/source/blender/python/generic/bgl.h b/source/blender/python/generic/bgl.h
index ee8c293945a..4e59eab46ce 100644
--- a/source/blender/python/generic/bgl.h
+++ b/source/blender/python/generic/bgl.h
@@ -32,7 +32,8 @@ int BGL_typeSize(int type);
* For Python access to OpenGL functions requiring a pointer.
*/
typedef struct _Buffer {
- PyObject_VAR_HEAD PyObject *parent;
+ PyObject_VAR_HEAD
+ PyObject *parent;
int type; /* GL_BYTE, GL_SHORT, GL_INT, GL_FLOAT */
int ndimensions;
diff --git a/source/blender/python/generic/idprop_py_api.h b/source/blender/python/generic/idprop_py_api.h
index 478dc99f73d..5617efb9a8c 100644
--- a/source/blender/python/generic/idprop_py_api.h
+++ b/source/blender/python/generic/idprop_py_api.h
@@ -36,19 +36,22 @@ extern PyTypeObject BPy_IDGroup_Type;
#define BPy_IDGroup_CheckExact(v) (Py_TYPE(v) == &BPy_IDGroup_Type)
typedef struct BPy_IDProperty {
- PyObject_VAR_HEAD struct ID *id; /* can be NULL */
- struct IDProperty *prop; /* must be second member */
+ PyObject_VAR_HEAD
+ struct ID *id; /* can be NULL */
+ struct IDProperty *prop; /* must be second member */
struct IDProperty *parent;
PyObject *data_wrap;
} BPy_IDProperty;
typedef struct BPy_IDArray {
- PyObject_VAR_HEAD struct ID *id; /* can be NULL */
- struct IDProperty *prop; /* must be second member */
+ PyObject_VAR_HEAD
+ struct ID *id; /* can be NULL */
+ struct IDProperty *prop; /* must be second member */
} BPy_IDArray;
typedef struct BPy_IDGroup_Iter {
- PyObject_VAR_HEAD BPy_IDProperty *group;
+ PyObject_VAR_HEAD
+ BPy_IDProperty *group;
struct IDProperty *cur;
int mode;
} BPy_IDGroup_Iter;
diff --git a/source/blender/python/generic/imbuf_py_api.c b/source/blender/python/generic/imbuf_py_api.c
index 97a66bc23c0..f2974239b9b 100644
--- a/source/blender/python/generic/imbuf_py_api.c
+++ b/source/blender/python/generic/imbuf_py_api.c
@@ -50,8 +50,8 @@ static PyObject *Py_ImBuf_CreatePyObject(ImBuf *ibuf);
typedef struct Py_ImBuf {
PyObject_VAR_HEAD
- /* can be NULL */
- ImBuf *ibuf;
+ /* can be NULL */
+ ImBuf *ibuf;
} Py_ImBuf;
static int py_imbuf_valid_check(Py_ImBuf *self)
diff --git a/source/blender/python/gpu/gpu_py_batch.h b/source/blender/python/gpu/gpu_py_batch.h
index 7c882eab8fc..84332ab4ca6 100644
--- a/source/blender/python/gpu/gpu_py_batch.h
+++ b/source/blender/python/gpu/gpu_py_batch.h
@@ -30,8 +30,8 @@ extern PyTypeObject BPyGPUBatch_Type;
typedef struct BPyGPUBatch {
PyObject_VAR_HEAD
- /* The batch is owned, we may support thin wrapped batches later. */
- struct GPUBatch *batch;
+ /* The batch is owned, we may support thin wrapped batches later. */
+ struct GPUBatch *batch;
#ifdef USE_GPU_PY_REFERENCES
/* Just to keep a user to prevent freeing buf's we're using */
PyObject *references;
diff --git a/source/blender/python/gpu/gpu_py_buffer.h b/source/blender/python/gpu/gpu_py_buffer.h
index 5eac5e3d309..9df22e9b780 100644
--- a/source/blender/python/gpu/gpu_py_buffer.h
+++ b/source/blender/python/gpu/gpu_py_buffer.h
@@ -30,7 +30,8 @@ extern PyTypeObject BPyGPU_BufferType;
* For Python access to GPU functions requiring a pointer.
*/
typedef struct BPyGPUBuffer {
- PyObject_VAR_HEAD PyObject *parent;
+ PyObject_VAR_HEAD
+ PyObject *parent;
int format;
int shape_len;
diff --git a/source/blender/python/gpu/gpu_py_element.h b/source/blender/python/gpu/gpu_py_element.h
index a8e22aae15a..1e4e905dda6 100644
--- a/source/blender/python/g
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list