[Bf-blender-cvs] [65701599290] master: Cleanup: update clang-format so PyObject_HEAD indents properly

Campbell Barton noreply at git.blender.org
Thu Jun 24 09:12:58 CEST 2021


Commit: 65701599290292a0e57c005f45c7dfa0c3333177
Author: Campbell Barton
Date:   Thu Jun 24 17:10:22 2021 +1000
Branches: master
https://developer.blender.org/rB65701599290292a0e57c005f45c7dfa0c3333177

Cleanup: update clang-format so PyObject_HEAD indents properly

===================================================================

M	.clang-format
M	source/blender/freestyle/intern/python/BPy_BBox.h
M	source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h
M	source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h
M	source/blender/freestyle/intern/python/BPy_FrsMaterial.h
M	source/blender/freestyle/intern/python/BPy_FrsNoise.h
M	source/blender/freestyle/intern/python/BPy_Id.h
M	source/blender/freestyle/intern/python/BPy_Interface0D.h
M	source/blender/freestyle/intern/python/BPy_Interface1D.h
M	source/blender/freestyle/intern/python/BPy_Iterator.h
M	source/blender/freestyle/intern/python/BPy_SShape.h
M	source/blender/freestyle/intern/python/BPy_StrokeAttribute.h
M	source/blender/freestyle/intern/python/BPy_StrokeShader.h
M	source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h
M	source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h
M	source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.h
M	source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h
M	source/blender/freestyle/intern/python/BPy_ViewMap.h
M	source/blender/freestyle/intern/python/BPy_ViewShape.h
M	source/blender/python/bmesh/bmesh_py_ops_call.h
M	source/blender/python/gpu/gpu_py_framebuffer.c
M	source/blender/python/gpu/gpu_py_framebuffer.h
M	source/blender/python/gpu/gpu_py_matrix.c
M	source/blender/python/gpu/gpu_py_offscreen.c
M	source/blender/python/gpu/gpu_py_offscreen.h
M	source/blender/python/gpu/gpu_py_texture.h
M	source/blender/python/gpu/gpu_py_uniformbuffer.h
M	source/blender/python/intern/bpy_app_translations.c
M	source/blender/python/intern/bpy_interface.c
M	source/blender/python/intern/bpy_interface_run.c
M	source/blender/python/intern/bpy_library_load.c
M	source/blender/python/intern/bpy_props.h
M	source/blender/python/intern/bpy_rna.h
M	source/blender/python/intern/bpy_rna_data.c
M	source/blender/python/mathutils/mathutils_Matrix.c
M	source/blender/python/mathutils/mathutils_bvhtree.c
M	source/blender/python/mathutils/mathutils_kdtree.c

===================================================================

diff --git a/.clang-format b/.clang-format
index 9cc3cdeaaf8..bf20a4e4c4a 100644
--- a/.clang-format
+++ b/.clang-format
@@ -265,4 +265,5 @@ ForEachMacros:
   - VECTOR_SET_SLOT_PROBING_BEGIN
 
 StatementMacros:
+  - PyObject_HEAD
   - PyObject_VAR_HEAD
diff --git a/source/blender/freestyle/intern/python/BPy_BBox.h b/source/blender/freestyle/intern/python/BPy_BBox.h
index 889dbc62a41..9d81a62bbcc 100644
--- a/source/blender/freestyle/intern/python/BPy_BBox.h
+++ b/source/blender/freestyle/intern/python/BPy_BBox.h
@@ -39,7 +39,8 @@ extern PyTypeObject BBox_Type;
 
 /*---------------------------Python BPy_BBox structure definition----------*/
 typedef struct {
-  PyObject_HEAD Freestyle::BBox<Freestyle::Geometry::Vec3r> *bb;
+  PyObject_HEAD
+  Freestyle::BBox<Freestyle::Geometry::Vec3r> *bb;
 } BPy_BBox;
 
 /*---------------------------Python BPy_BBox visible prototypes-----------*/
diff --git a/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h b/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h
index a368d4cd47e..0d494092388 100644
--- a/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h
+++ b/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h
@@ -39,7 +39,8 @@ extern PyTypeObject BinaryPredicate0D_Type;
 
 /*---------------------------Python BPy_BinaryPredicate0D structure definition----------*/
 typedef struct {
-  PyObject_HEAD Freestyle::BinaryPredicate0D *bp0D;
+  PyObject_HEAD
+  Freestyle::BinaryPredicate0D *bp0D;
 } BPy_BinaryPredicate0D;
 
 /*---------------------------Python BPy_BinaryPredicate0D visible prototypes-----------*/
diff --git a/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h b/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h
index b34fad9e213..3e5ff76b5f9 100644
--- a/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h
+++ b/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h
@@ -39,7 +39,8 @@ extern PyTypeObject BinaryPredicate1D_Type;
 
 /*---------------------------Python BPy_BinaryPredicate1D structure definition----------*/
 typedef struct {
-  PyObject_HEAD Freestyle::BinaryPredicate1D *bp1D;
+  PyObject_HEAD
+  Freestyle::BinaryPredicate1D *bp1D;
 } BPy_BinaryPredicate1D;
 
 /*---------------------------Python BPy_BinaryPredicate1D visible prototypes-----------*/
diff --git a/source/blender/freestyle/intern/python/BPy_FrsMaterial.h b/source/blender/freestyle/intern/python/BPy_FrsMaterial.h
index 084fcef9a62..1104e2d5d77 100644
--- a/source/blender/freestyle/intern/python/BPy_FrsMaterial.h
+++ b/source/blender/freestyle/intern/python/BPy_FrsMaterial.h
@@ -39,7 +39,8 @@ extern PyTypeObject FrsMaterial_Type;
 
 /*---------------------------Python BPy_FrsMaterial structure definition----------*/
 typedef struct {
-  PyObject_HEAD Freestyle::FrsMaterial *m;
+  PyObject_HEAD
+  Freestyle::FrsMaterial *m;
 } BPy_FrsMaterial;
 
 /*---------------------------Python BPy_FrsMaterial visible prototypes-----------*/
diff --git a/source/blender/freestyle/intern/python/BPy_FrsNoise.h b/source/blender/freestyle/intern/python/BPy_FrsNoise.h
index 0f8f2d3242c..ac53282eb2a 100644
--- a/source/blender/freestyle/intern/python/BPy_FrsNoise.h
+++ b/source/blender/freestyle/intern/python/BPy_FrsNoise.h
@@ -39,7 +39,8 @@ extern PyTypeObject FrsNoise_Type;
 
 /*---------------------------Python BPy_FrsNoise structure definition----------*/
 typedef struct {
-  PyObject_HEAD Freestyle::Noise *n;
+  PyObject_HEAD
+  Freestyle::Noise *n;
   Freestyle::PseudoNoise *pn;
 } BPy_FrsNoise;
 
diff --git a/source/blender/freestyle/intern/python/BPy_Id.h b/source/blender/freestyle/intern/python/BPy_Id.h
index 51a70a391b1..e3c211381ca 100644
--- a/source/blender/freestyle/intern/python/BPy_Id.h
+++ b/source/blender/freestyle/intern/python/BPy_Id.h
@@ -40,7 +40,8 @@ extern PyTypeObject Id_Type;
 
 /*---------------------------Python BPy_Id structure definition----------*/
 typedef struct {
-  PyObject_HEAD Freestyle::Id *id;
+  PyObject_HEAD
+  Freestyle::Id *id;
 } BPy_Id;
 
 /*---------------------------Python BPy_Id visible prototypes-----------*/
diff --git a/source/blender/freestyle/intern/python/BPy_Interface0D.h b/source/blender/freestyle/intern/python/BPy_Interface0D.h
index 9734378f446..75a7e42e316 100644
--- a/source/blender/freestyle/intern/python/BPy_Interface0D.h
+++ b/source/blender/freestyle/intern/python/BPy_Interface0D.h
@@ -39,7 +39,8 @@ extern PyTypeObject Interface0D_Type;
 
 /*---------------------------Python BPy_Interface0D structure definition----------*/
 typedef struct {
-  PyObject_HEAD Freestyle::Interface0D *if0D;
+  PyObject_HEAD
+  Freestyle::Interface0D *if0D;
   bool borrowed; /* true if *if0D is a borrowed object */
 } BPy_Interface0D;
 
diff --git a/source/blender/freestyle/intern/python/BPy_Interface1D.h b/source/blender/freestyle/intern/python/BPy_Interface1D.h
index 4ed562c24f7..ad6bb5aebec 100644
--- a/source/blender/freestyle/intern/python/BPy_Interface1D.h
+++ b/source/blender/freestyle/intern/python/BPy_Interface1D.h
@@ -39,7 +39,8 @@ extern PyTypeObject Interface1D_Type;
 
 /*---------------------------Python BPy_Interface1D structure definition----------*/
 typedef struct {
-  PyObject_HEAD Freestyle::Interface1D *if1D;
+  PyObject_HEAD
+  Freestyle::Interface1D *if1D;
   bool borrowed; /* true if *if1D is a borrowed object */
 } BPy_Interface1D;
 
diff --git a/source/blender/freestyle/intern/python/BPy_Iterator.h b/source/blender/freestyle/intern/python/BPy_Iterator.h
index 7094384140f..c7f64c3844e 100644
--- a/source/blender/freestyle/intern/python/BPy_Iterator.h
+++ b/source/blender/freestyle/intern/python/BPy_Iterator.h
@@ -38,7 +38,8 @@ extern PyTypeObject Iterator_Type;
 
 /*---------------------------Python BPy_Iterator structure definition----------*/
 typedef struct {
-  PyObject_HEAD Freestyle::Iterator *it;
+  PyObject_HEAD
+  Freestyle::Iterator *it;
 } BPy_Iterator;
 
 /*---------------------------Python BPy_Iterator visible prototypes-----------*/
diff --git a/source/blender/freestyle/intern/python/BPy_SShape.h b/source/blender/freestyle/intern/python/BPy_SShape.h
index a6fb090a537..404d0ebc602 100644
--- a/source/blender/freestyle/intern/python/BPy_SShape.h
+++ b/source/blender/freestyle/intern/python/BPy_SShape.h
@@ -38,7 +38,8 @@ extern PyTypeObject SShape_Type;
 
 /*---------------------------Python BPy_SShape structure definition----------*/
 typedef struct {
-  PyObject_HEAD Freestyle::SShape *ss;
+  PyObject_HEAD
+  Freestyle::SShape *ss;
   bool borrowed; /* true if *ss is a borrowed object */
 } BPy_SShape;
 
diff --git a/source/blender/freestyle/intern/python/BPy_StrokeAttribute.h b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.h
index 9c0a7368dcb..b3280095e1e 100644
--- a/source/blender/freestyle/intern/python/BPy_StrokeAttribute.h
+++ b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.h
@@ -39,7 +39,8 @@ extern PyTypeObject StrokeAttribute_Type;
 
 /*---------------------------Python BPy_StrokeAttribute structure definition----------*/
 typedef struct {
-  PyObject_HEAD Freestyle::StrokeAttribute *sa;
+  PyObject_HEAD
+  Freestyle::StrokeAttribute *sa;
   bool borrowed; /* true if *sa is a borrowed reference */
 } BPy_StrokeAttribute;
 
diff --git a/source/blender/freestyle/intern/python/BPy_StrokeShader.h b/source/blender/freestyle/intern/python/BPy_StrokeShader.h
index 74c5df52312..0881c07caf1 100644
--- a/source/blender/freestyle/intern/python/BPy_StrokeShader.h
+++ b/source/blender/freestyle/intern/python/BPy_StrokeShader.h
@@ -41,7 +41,8 @@ extern PyTypeObject StrokeShader_Type;
 
 /*---------------------------Python BPy_StrokeShader structure definition----------*/
 typedef struct {
-  PyObject_HEAD Freestyle::StrokeShader *ss;
+  PyObject_HEAD
+  Freestyle::StrokeShader *ss;
 } BPy_StrokeShader;
 
 /*---------------------------Python BPy_StrokeShader visible prototypes-----------*/
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h b/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h
index ef3021faf48..86fd6b39ab8 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h
+++ b/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h
@@ -39,7 +39,8 @@ extern PyTypeObject UnaryFunction0D_Type;
 
 /*---------------------------Python BPy_UnaryFunction0D structure definition----------*/
 typedef struct {
-  PyObject_HEAD PyObject *py_uf0D;
+  PyObject_HEAD
+  PyObject *py_uf0D;
 } BPy_UnaryFunction0D;
 
 /*---------------------------Python BPy_UnaryFunction0D visible prototypes-----------*/
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h
index 4613d58c2b7..12159c79885 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h
+++ b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h
@@ -39,7 +39,8 @@ extern PyTypeObject UnaryFunction1D_Type;
 
 /*---------------------------Python BPy_UnaryFunction1D structure definition----------*/
 typedef struct {
-  PyObject_HEAD PyObject *py_uf1D;
+  PyObject_HEAD
+  PyObject *py_uf1D;
 } BPy_UnaryFunction1D;
 
 /*---------------------------Python BPy_UnaryFunction1D visible prototypes-----------*/
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.h b/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.h
index 3d45c2fc701..027994568b4 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.h
+++ b/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.h
@@ -39,7 +39,8 @@ extern PyTypeObject UnaryPredicate0D_Type;
 
 /*---------------------------Python BPy_UnaryPredicate0D structure definition----------*/
 typedef struct {
-  PyObject_HEAD Freestyle::UnaryPredicate0D *up0D;
+  PyObject_HEAD
+  Freestyle::UnaryPredicate0D *up0D;
 } BPy_UnaryPredicate0D;
 
 /*---------------------------Python BPy_UnaryPredicate0D visible prototypes-----------*/
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h
index 0139ed8af77..0f8b00f7f3c 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h
+++ b/source/blender/freesty

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list