From e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 17 Apr 2019 06:17:24 +0200 Subject: ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat --- .../blender/freestyle/intern/python/BPy_Convert.h | 88 +++++++++++----------- 1 file changed, 44 insertions(+), 44 deletions(-) (limited to 'source/blender/freestyle/intern/python/BPy_Convert.h') diff --git a/source/blender/freestyle/intern/python/BPy_Convert.h b/source/blender/freestyle/intern/python/BPy_Convert.h index 1b0ce43640b..fffe25fde60 100644 --- a/source/blender/freestyle/intern/python/BPy_Convert.h +++ b/source/blender/freestyle/intern/python/BPy_Convert.h @@ -95,52 +95,53 @@ extern "C" { //============================== PyObject *PyBool_from_bool(bool b); -PyObject *Vector_from_Vec2f(Vec2f& v); -PyObject *Vector_from_Vec3f(Vec3f& v); -PyObject *Vector_from_Vec3r(Vec3r& v); - -PyObject *Any_BPy_Interface0D_from_Interface0D(Interface0D& if0D); -PyObject *Any_BPy_Interface1D_from_Interface1D(Interface1D& if1D); -PyObject *Any_BPy_FEdge_from_FEdge(FEdge& fe); -PyObject *Any_BPy_ViewVertex_from_ViewVertex(ViewVertex& vv); - -PyObject *BPy_BBox_from_BBox(const BBox< Vec3r > &bb); -PyObject *BPy_CurvePoint_from_CurvePoint(CurvePoint& cp); -PyObject *BPy_directedViewEdge_from_directedViewEdge(ViewVertex::directedViewEdge& dve); -PyObject *BPy_FEdge_from_FEdge(FEdge& fe); -PyObject *BPy_FEdgeSharp_from_FEdgeSharp(FEdgeSharp& fes); -PyObject *BPy_FEdgeSmooth_from_FEdgeSmooth(FEdgeSmooth& fes); -PyObject *BPy_Id_from_Id(Id& id); -PyObject *BPy_Interface0D_from_Interface0D(Interface0D& if0D); -PyObject *BPy_Interface1D_from_Interface1D(Interface1D& if1D); +PyObject *Vector_from_Vec2f(Vec2f &v); +PyObject *Vector_from_Vec3f(Vec3f &v); +PyObject *Vector_from_Vec3r(Vec3r &v); + +PyObject *Any_BPy_Interface0D_from_Interface0D(Interface0D &if0D); +PyObject *Any_BPy_Interface1D_from_Interface1D(Interface1D &if1D); +PyObject *Any_BPy_FEdge_from_FEdge(FEdge &fe); +PyObject *Any_BPy_ViewVertex_from_ViewVertex(ViewVertex &vv); + +PyObject *BPy_BBox_from_BBox(const BBox &bb); +PyObject *BPy_CurvePoint_from_CurvePoint(CurvePoint &cp); +PyObject *BPy_directedViewEdge_from_directedViewEdge(ViewVertex::directedViewEdge &dve); +PyObject *BPy_FEdge_from_FEdge(FEdge &fe); +PyObject *BPy_FEdgeSharp_from_FEdgeSharp(FEdgeSharp &fes); +PyObject *BPy_FEdgeSmooth_from_FEdgeSmooth(FEdgeSmooth &fes); +PyObject *BPy_Id_from_Id(Id &id); +PyObject *BPy_Interface0D_from_Interface0D(Interface0D &if0D); +PyObject *BPy_Interface1D_from_Interface1D(Interface1D &if1D); PyObject *BPy_IntegrationType_from_IntegrationType(IntegrationType i); -PyObject *BPy_FrsMaterial_from_FrsMaterial(const FrsMaterial& m); +PyObject *BPy_FrsMaterial_from_FrsMaterial(const FrsMaterial &m); PyObject *BPy_Nature_from_Nature(unsigned short n); PyObject *BPy_MediumType_from_MediumType(Stroke::MediumType n); -PyObject *BPy_SShape_from_SShape(SShape& ss); -PyObject *BPy_Stroke_from_Stroke(Stroke& s); -PyObject *BPy_StrokeAttribute_from_StrokeAttribute(StrokeAttribute& sa); -PyObject *BPy_StrokeVertex_from_StrokeVertex(StrokeVertex& sv); -PyObject *BPy_SVertex_from_SVertex(SVertex& sv); -PyObject *BPy_ViewVertex_from_ViewVertex(ViewVertex& vv); -PyObject *BPy_NonTVertex_from_NonTVertex(NonTVertex& ntv); -PyObject *BPy_TVertex_from_TVertex(TVertex& tv); -PyObject *BPy_ViewEdge_from_ViewEdge(ViewEdge& ve); -PyObject *BPy_Chain_from_Chain(Chain& c); -PyObject *BPy_ViewShape_from_ViewShape(ViewShape& vs); - -PyObject *BPy_AdjacencyIterator_from_AdjacencyIterator(AdjacencyIterator& a_it); -PyObject *BPy_Interface0DIterator_from_Interface0DIterator(Interface0DIterator& if0D_it, bool reversed); -PyObject *BPy_CurvePointIterator_from_CurvePointIterator(CurveInternal::CurvePointIterator& cp_it); -PyObject *BPy_StrokeVertexIterator_from_StrokeVertexIterator(StrokeInternal::StrokeVertexIterator& sv_it, - bool reversed); -PyObject *BPy_SVertexIterator_from_SVertexIterator(ViewEdgeInternal::SVertexIterator& sv_it); -PyObject *BPy_orientedViewEdgeIterator_from_orientedViewEdgeIterator(ViewVertexInternal::orientedViewEdgeIterator& ove_it, - bool reversed); -PyObject *BPy_ViewEdgeIterator_from_ViewEdgeIterator(ViewEdgeInternal::ViewEdgeIterator& ve_it); -PyObject *BPy_ChainingIterator_from_ChainingIterator(ChainingIterator& c_it); -PyObject *BPy_ChainPredicateIterator_from_ChainPredicateIterator(ChainPredicateIterator& cp_it); -PyObject *BPy_ChainSilhouetteIterator_from_ChainSilhouetteIterator(ChainSilhouetteIterator& cs_it); +PyObject *BPy_SShape_from_SShape(SShape &ss); +PyObject *BPy_Stroke_from_Stroke(Stroke &s); +PyObject *BPy_StrokeAttribute_from_StrokeAttribute(StrokeAttribute &sa); +PyObject *BPy_StrokeVertex_from_StrokeVertex(StrokeVertex &sv); +PyObject *BPy_SVertex_from_SVertex(SVertex &sv); +PyObject *BPy_ViewVertex_from_ViewVertex(ViewVertex &vv); +PyObject *BPy_NonTVertex_from_NonTVertex(NonTVertex &ntv); +PyObject *BPy_TVertex_from_TVertex(TVertex &tv); +PyObject *BPy_ViewEdge_from_ViewEdge(ViewEdge &ve); +PyObject *BPy_Chain_from_Chain(Chain &c); +PyObject *BPy_ViewShape_from_ViewShape(ViewShape &vs); + +PyObject *BPy_AdjacencyIterator_from_AdjacencyIterator(AdjacencyIterator &a_it); +PyObject *BPy_Interface0DIterator_from_Interface0DIterator(Interface0DIterator &if0D_it, + bool reversed); +PyObject *BPy_CurvePointIterator_from_CurvePointIterator(CurveInternal::CurvePointIterator &cp_it); +PyObject *BPy_StrokeVertexIterator_from_StrokeVertexIterator( + StrokeInternal::StrokeVertexIterator &sv_it, bool reversed); +PyObject *BPy_SVertexIterator_from_SVertexIterator(ViewEdgeInternal::SVertexIterator &sv_it); +PyObject *BPy_orientedViewEdgeIterator_from_orientedViewEdgeIterator( + ViewVertexInternal::orientedViewEdgeIterator &ove_it, bool reversed); +PyObject *BPy_ViewEdgeIterator_from_ViewEdgeIterator(ViewEdgeInternal::ViewEdgeIterator &ve_it); +PyObject *BPy_ChainingIterator_from_ChainingIterator(ChainingIterator &c_it); +PyObject *BPy_ChainPredicateIterator_from_ChainPredicateIterator(ChainPredicateIterator &cp_it); +PyObject *BPy_ChainSilhouetteIterator_from_ChainSilhouetteIterator(ChainSilhouetteIterator &cs_it); //============================== // Python => C++ @@ -177,5 +178,4 @@ int convert_v2(PyObject *obj, void *v); } #endif - #endif /* __FREESTYLE_PYTHON_CONVERT_H__ */ -- cgit v1.2.3