diff options
Diffstat (limited to 'source/blender/freestyle/intern/python')
180 files changed, 227 insertions, 687 deletions
diff --git a/source/blender/freestyle/intern/python/BPy_BBox.h b/source/blender/freestyle/intern/python/BPy_BBox.h index 84542dc6d1c..a284deed10c 100644 --- a/source/blender/freestyle/intern/python/BPy_BBox.h +++ b/source/blender/freestyle/intern/python/BPy_BBox.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_BBOX_H__ -#define __FREESTYLE_PYTHON_BBOX_H__ +#pragma once extern "C" { #include <Python.h> @@ -55,5 +54,3 @@ int BBox_Init(PyObject *module); #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_BBOX_H__ */ diff --git a/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h b/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h index 3d0575a676c..cdf81f3e4fc 100644 --- a/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h +++ b/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_BINARYPREDICATE0D_H__ -#define __FREESTYLE_PYTHON_BINARYPREDICATE0D_H__ +#pragma once extern "C" { #include <Python.h> @@ -54,5 +53,3 @@ int BinaryPredicate0D_Init(PyObject *module); #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_BINARYPREDICATE0D_H__ */ diff --git a/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h b/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h index b258f293694..b761f6f6ace 100644 --- a/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h +++ b/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_BINARYPREDICATE1D_H__ -#define __FREESTYLE_PYTHON_BINARYPREDICATE1D_H__ +#pragma once extern "C" { #include <Python.h> @@ -54,5 +53,3 @@ int BinaryPredicate1D_Init(PyObject *module); #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_BINARYPREDICATE1D_H__ */ diff --git a/source/blender/freestyle/intern/python/BPy_ContextFunctions.h b/source/blender/freestyle/intern/python/BPy_ContextFunctions.h index 674023fa008..4cc04379f18 100644 --- a/source/blender/freestyle/intern/python/BPy_ContextFunctions.h +++ b/source/blender/freestyle/intern/python/BPy_ContextFunctions.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_CONTEXTFUNCTIONS_H__ -#define __FREESTYLE_PYTHON_CONTEXTFUNCTIONS_H__ +#pragma once extern "C" { #include <Python.h> @@ -36,5 +35,3 @@ int ContextFunctions_Init(PyObject *module); #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_CONTEXTFUNCTIONS_H__ */ diff --git a/source/blender/freestyle/intern/python/BPy_Convert.cpp b/source/blender/freestyle/intern/python/BPy_Convert.cpp index 427e4198e5c..03f9760344b 100644 --- a/source/blender/freestyle/intern/python/BPy_Convert.cpp +++ b/source/blender/freestyle/intern/python/BPy_Convert.cpp @@ -110,22 +110,22 @@ PyObject *Any_BPy_Interface0D_from_Interface0D(Interface0D &if0D) if (typeid(if0D) == typeid(CurvePoint)) { return BPy_CurvePoint_from_CurvePoint(dynamic_cast<CurvePoint &>(if0D)); } - else if (typeid(if0D) == typeid(StrokeVertex)) { + if (typeid(if0D) == typeid(StrokeVertex)) { return BPy_StrokeVertex_from_StrokeVertex(dynamic_cast<StrokeVertex &>(if0D)); } - else if (typeid(if0D) == typeid(SVertex)) { + if (typeid(if0D) == typeid(SVertex)) { return BPy_SVertex_from_SVertex(dynamic_cast<SVertex &>(if0D)); } - else if (typeid(if0D) == typeid(ViewVertex)) { + if (typeid(if0D) == typeid(ViewVertex)) { return BPy_ViewVertex_from_ViewVertex(dynamic_cast<ViewVertex &>(if0D)); } - else if (typeid(if0D) == typeid(NonTVertex)) { + if (typeid(if0D) == typeid(NonTVertex)) { return BPy_NonTVertex_from_NonTVertex(dynamic_cast<NonTVertex &>(if0D)); } - else if (typeid(if0D) == typeid(TVertex)) { + if (typeid(if0D) == typeid(TVertex)) { return BPy_TVertex_from_TVertex(dynamic_cast<TVertex &>(if0D)); } - else if (typeid(if0D) == typeid(Interface0D)) { + if (typeid(if0D) == typeid(Interface0D)) { return BPy_Interface0D_from_Interface0D(if0D); } string msg("unexpected type: " + if0D.getExactTypeName()); @@ -138,22 +138,22 @@ PyObject *Any_BPy_Interface1D_from_Interface1D(Interface1D &if1D) if (typeid(if1D) == typeid(ViewEdge)) { return BPy_ViewEdge_from_ViewEdge(dynamic_cast<ViewEdge &>(if1D)); } - else if (typeid(if1D) == typeid(Chain)) { + if (typeid(if1D) == typeid(Chain)) { return BPy_Chain_from_Chain(dynamic_cast<Chain &>(if1D)); } - else if (typeid(if1D) == typeid(Stroke)) { + if (typeid(if1D) == typeid(Stroke)) { return BPy_Stroke_from_Stroke(dynamic_cast<Stroke &>(if1D)); } - else if (typeid(if1D) == typeid(FEdgeSharp)) { + if (typeid(if1D) == typeid(FEdgeSharp)) { return BPy_FEdgeSharp_from_FEdgeSharp(dynamic_cast<FEdgeSharp &>(if1D)); } - else if (typeid(if1D) == typeid(FEdgeSmooth)) { + if (typeid(if1D) == typeid(FEdgeSmooth)) { return BPy_FEdgeSmooth_from_FEdgeSmooth(dynamic_cast<FEdgeSmooth &>(if1D)); } - else if (typeid(if1D) == typeid(FEdge)) { + if (typeid(if1D) == typeid(FEdge)) { return BPy_FEdge_from_FEdge(dynamic_cast<FEdge &>(if1D)); } - else if (typeid(if1D) == typeid(Interface1D)) { + if (typeid(if1D) == typeid(Interface1D)) { return BPy_Interface1D_from_Interface1D(if1D); } string msg("unexpected type: " + if1D.getExactTypeName()); @@ -166,10 +166,10 @@ PyObject *Any_BPy_FEdge_from_FEdge(FEdge &fe) if (typeid(fe) == typeid(FEdgeSharp)) { return BPy_FEdgeSharp_from_FEdgeSharp(dynamic_cast<FEdgeSharp &>(fe)); } - else if (typeid(fe) == typeid(FEdgeSmooth)) { + if (typeid(fe) == typeid(FEdgeSmooth)) { return BPy_FEdgeSmooth_from_FEdgeSmooth(dynamic_cast<FEdgeSmooth &>(fe)); } - else if (typeid(fe) == typeid(FEdge)) { + if (typeid(fe) == typeid(FEdge)) { return BPy_FEdge_from_FEdge(fe); } string msg("unexpected type: " + fe.getExactTypeName()); @@ -182,10 +182,10 @@ PyObject *Any_BPy_ViewVertex_from_ViewVertex(ViewVertex &vv) if (typeid(vv) == typeid(NonTVertex)) { return BPy_NonTVertex_from_NonTVertex(dynamic_cast<NonTVertex &>(vv)); } - else if (typeid(vv) == typeid(TVertex)) { + if (typeid(vv) == typeid(TVertex)) { return BPy_TVertex_from_TVertex(dynamic_cast<TVertex &>(vv)); } - else if (typeid(vv) == typeid(ViewVertex)) { + if (typeid(vv) == typeid(ViewVertex)) { return BPy_ViewVertex_from_ViewVertex(vv); } string msg("unexpected type: " + vv.getExactTypeName()); @@ -773,7 +773,7 @@ bool float_array_from_PyObject(PyObject *obj, float *v, int n) } return 1; } - else if (ColorObject_Check(obj) && n == 3) { + if (ColorObject_Check(obj) && n == 3) { if (BaseMath_ReadCallback((BaseMathObject *)obj) == -1) { return 0; } @@ -782,10 +782,10 @@ bool float_array_from_PyObject(PyObject *obj, float *v, int n) } return 1; } - else if (PyList_Check(obj) && PyList_GET_SIZE(obj) == n) { + if (PyList_Check(obj) && PyList_GET_SIZE(obj) == n) { return float_array_from_PyList(obj, v, n); } - else if (PyTuple_Check(obj) && PyTuple_GET_SIZE(obj) == n) { + if (PyTuple_Check(obj) && PyTuple_GET_SIZE(obj) == n) { return float_array_from_PyTuple(obj, v, n); } return 0; diff --git a/source/blender/freestyle/intern/python/BPy_Convert.h b/source/blender/freestyle/intern/python/BPy_Convert.h index 19e0879beff..5a1c11ec086 100644 --- a/source/blender/freestyle/intern/python/BPy_Convert.h +++ b/source/blender/freestyle/intern/python/BPy_Convert.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_CONVERT_H__ -#define __FREESTYLE_PYTHON_CONVERT_H__ +#pragma once extern "C" { #include <Python.h> @@ -177,5 +176,3 @@ int convert_v2(PyObject *obj, void *v); #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_CONVERT_H__ */ diff --git a/source/blender/freestyle/intern/python/BPy_Freestyle.cpp b/source/blender/freestyle/intern/python/BPy_Freestyle.cpp index 33078e6ba6a..9796dcda964 100644 --- a/source/blender/freestyle/intern/python/BPy_Freestyle.cpp +++ b/source/blender/freestyle/intern/python/BPy_Freestyle.cpp @@ -264,7 +264,7 @@ static PyObject *Freestyle_evaluateCurveMappingF(PyObject * /*self*/, PyObject * return NULL; } cumap = (CurveMapping *)py_srna->ptr.data; - BKE_curvemapping_initialize(cumap); + BKE_curvemapping_init(cumap); /* disable extrapolation if enabled */ if ((cumap->flag & CUMA_EXTEND_EXTRAPOLATE)) { cumap->flag &= ~CUMA_EXTEND_EXTRAPOLATE; diff --git a/source/blender/freestyle/intern/python/BPy_Freestyle.h b/source/blender/freestyle/intern/python/BPy_Freestyle.h index a3a482be9ee..f63eb0d8466 100644 --- a/source/blender/freestyle/intern/python/BPy_Freestyle.h +++ b/source/blender/freestyle/intern/python/BPy_Freestyle.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_FREESTYLE_H__ -#define __FREESTYLE_PYTHON_FREESTYLE_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -38,5 +37,3 @@ PyObject *Freestyle_Init(void); #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_FREESTYLE_H__ */ diff --git a/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp b/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp index 2c226e330d7..dbf1c12fb01 100644 --- a/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp +++ b/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp @@ -108,7 +108,7 @@ static int FrsMaterial_init(BPy_FrsMaterial *self, PyObject *args, PyObject *kwd self->m = new FrsMaterial(*m); } } - else if (PyErr_Clear(), + else if ((void)PyErr_Clear(), PyArg_ParseTupleAndKeywords(args, kwds, "O&O&O&O&O&fi", @@ -508,9 +508,8 @@ static PyObject *BPy_FrsMaterial_richcmpr(PyObject *objectA, if (comparison_type == Py_NE) { Py_RETURN_TRUE; } - else { - Py_RETURN_FALSE; - } + + Py_RETURN_FALSE; } matA = (BPy_FrsMaterial *)objectA; @@ -531,9 +530,8 @@ static PyObject *BPy_FrsMaterial_richcmpr(PyObject *objectA, if (result == true) { Py_RETURN_TRUE; } - else { - Py_RETURN_FALSE; - } + + Py_RETURN_FALSE; } static Py_hash_t FrsMaterial_hash(PyObject *self) diff --git a/source/blender/freestyle/intern/python/BPy_FrsMaterial.h b/source/blender/freestyle/intern/python/BPy_FrsMaterial.h index 84a3ac2463f..13a116d7ef2 100644 --- a/source/blender/freestyle/intern/python/BPy_FrsMaterial.h +++ b/source/blender/freestyle/intern/python/BPy_FrsMaterial.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_FRSMATERIAL_H__ -#define __FREESTYLE_PYTHON_FRSMATERIAL_H__ +#pragma once extern "C" { #include <Python.h> @@ -55,5 +54,3 @@ void FrsMaterial_mathutils_register_callback(); #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_FRSMATERIAL_H__ */ diff --git a/source/blender/freestyle/intern/python/BPy_FrsNoise.h b/source/blender/freestyle/intern/python/BPy_FrsNoise.h index 9dcf59779cf..09bcc82ae94 100644 --- a/source/blender/freestyle/intern/python/BPy_FrsNoise.h +++ b/source/blender/freestyle/intern/python/BPy_FrsNoise.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_FRSNOISE_H__ -#define __FREESTYLE_PYTHON_FRSNOISE_H__ +#pragma once extern "C" { #include <Python.h> @@ -55,5 +54,3 @@ int FrsNoise_Init(PyObject *module); #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_FRSNOISE_H__ */ diff --git a/source/blender/freestyle/intern/python/BPy_Id.cpp b/source/blender/freestyle/intern/python/BPy_Id.cpp index 4f61ba847f6..eb0eb661e3d 100644 --- a/source/blender/freestyle/intern/python/BPy_Id.cpp +++ b/source/blender/freestyle/intern/python/BPy_Id.cpp @@ -75,7 +75,7 @@ static int Id_init(BPy_Id *self, PyObject *args, PyObject *kwds) if (PyArg_ParseTupleAndKeywords(args, kwds, "O!", (char **)kwlist_1, &Id_Type, &brother)) { self->id = new Id(*(((BPy_Id *)brother)->id)); } - else if (PyErr_Clear(), + else if ((void)PyErr_Clear(), PyArg_ParseTupleAndKeywords(args, kwds, "|ii", (char **)kwlist_2, &first, &second)) { self->id = new Id(first, second); } diff --git a/source/blender/freestyle/intern/python/BPy_Id.h b/source/blender/freestyle/intern/python/BPy_Id.h index 3544f751453..f5952297c66 100644 --- a/source/blender/freestyle/intern/python/BPy_Id.h +++ b/source/blender/freestyle/intern/python/BPy_Id.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_ID_H__ -#define __FREESTYLE_PYTHON_ID_H__ +#pragma once extern "C" { #include <Python.h> @@ -57,5 +56,3 @@ int Id_Init(PyObject *module); #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_ID_H__ */ diff --git a/source/blender/freestyle/intern/python/BPy_IntegrationType.cpp b/source/blender/freestyle/intern/python/BPy_IntegrationType.cpp index 98b0099bcad..9c155db913c 100644 --- a/source/blender/freestyle/intern/python/BPy_IntegrationType.cpp +++ b/source/blender/freestyle/intern/python/BPy_IntegrationType.cpp @@ -88,21 +88,20 @@ static PyObject *Integrator_integrate(PyObject * /*self*/, PyObject *args, PyObj double res = integrate(*fun, it, it_end, t); return PyFloat_FromDouble(res); } - else if (BPy_UnaryFunction0DFloat_Check(obj1)) { + if (BPy_UnaryFunction0DFloat_Check(obj1)) { UnaryFunction0D<float> *fun = ((BPy_UnaryFunction0DFloat *)obj1)->uf0D_float; float res = integrate(*fun, it, it_end, t); return PyFloat_FromDouble(res); } - else if (BPy_UnaryFunction0DUnsigned_Check(obj1)) { + if (BPy_UnaryFunction0DUnsigned_Check(obj1)) { UnaryFunction0D<unsigned int> *fun = ((BPy_UnaryFunction0DUnsigned *)obj1)->uf0D_unsigned; unsigned int res = integrate(*fun, it, it_end, t); return PyLong_FromLong(res); } - else { - string class_name(Py_TYPE(obj1)->tp_name); - PyErr_SetString(PyExc_TypeError, ("unsupported function type: " + class_name).c_str()); - return NULL; - } + + string class_name(Py_TYPE(obj1)->tp_name); + PyErr_SetString(PyExc_TypeError, ("unsupported function type: " + class_name).c_str()); + return NULL; } /*-----------------------Integrator module docstring---------------------------------------*/ diff --git a/source/blender/freestyle/intern/python/BPy_IntegrationType.h b/source/blender/freestyle/intern/python/BPy_IntegrationType.h index 525feb002e4..be815c6c95a 100644 --- a/source/blender/freestyle/intern/python/BPy_IntegrationType.h +++ b/source/blender/freestyle/intern/python/BPy_IntegrationType.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_INTEGRATIONTYPE_H__ -#define __FREESTYLE_PYTHON_INTEGRATIONTYPE_H__ +#pragma once extern "C" { #include <Python.h> @@ -49,5 +48,3 @@ int IntegrationType_Init(PyObject *module); #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_INTEGRATIONTYPE_H__ */ diff --git a/source/blender/freestyle/intern/python/BPy_Interface0D.h b/source/blender/freestyle/intern/python/BPy_Interface0D.h index 81fdd40ff04..7e41a8888e1 100644 --- a/source/blender/freestyle/intern/python/BPy_Interface0D.h +++ b/source/blender/freestyle/intern/python/BPy_Interface0D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_INTERFACE0D_H__ -#define __FREESTYLE_PYTHON_INTERFACE0D_H__ +#pragma once extern "C" { #include <Python.h> @@ -55,5 +54,3 @@ int Interface0D_Init(PyObject *module); #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_INTERFACE0D_H__ */ diff --git a/source/blender/freestyle/intern/python/BPy_Interface1D.h b/source/blender/freestyle/intern/python/BPy_Interface1D.h index db9bfa7f79c..20a4af0b4d0 100644 --- a/source/blender/freestyle/intern/python/BPy_Interface1D.h +++ b/source/blender/freestyle/intern/python/BPy_Interface1D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_INTERFACE1D_H__ -#define __FREESTYLE_PYTHON_INTERFACE1D_H__ +#pragma once extern "C" { #include <Python.h> @@ -55,5 +54,3 @@ int Interface1D_Init(PyObject *module); #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_INTERFACE1D_H__ */ diff --git a/source/blender/freestyle/intern/python/BPy_Iterator.h b/source/blender/freestyle/intern/python/BPy_Iterator.h index f9f80c5f1db..5d1e8422976 100644 --- a/source/blender/freestyle/intern/python/BPy_Iterator.h +++ b/source/blender/freestyle/intern/python/BPy_Iterator.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_ITERATOR_H__ -#define __FREESTYLE_PYTHON_ITERATOR_H__ +#pragma once extern "C" { #include <Python.h> @@ -53,5 +52,3 @@ int Iterator_Init(PyObject *module); #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_ITERATOR_H__ */ diff --git a/source/blender/freestyle/intern/python/BPy_MediumType.h b/source/blender/freestyle/intern/python/BPy_MediumType.h index 5c91890c249..854f826291e 100644 --- a/source/blender/freestyle/intern/python/BPy_MediumType.h +++ b/source/blender/freestyle/intern/python/BPy_MediumType.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_MEDIUMTYPE_H__ -#define __FREESTYLE_PYTHON_MEDIUMTYPE_H__ +#pragma once extern "C" { #include <Python.h> @@ -62,5 +61,3 @@ extern PyLongObject _BPy_MediumType_OPAQUE_MEDIUM; #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_MEDIUMTYPE_H__ */ diff --git a/source/blender/freestyle/intern/python/BPy_Nature.h b/source/blender/freestyle/intern/python/BPy_Nature.h index 8eb33f02488..48d15c8e796 100644 --- a/source/blender/freestyle/intern/python/BPy_Nature.h +++ b/source/blender/freestyle/intern/python/BPy_Nature.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_NATURE_H__ -#define __FREESTYLE_PYTHON_NATURE_H__ +#pragma once extern "C" { #include <Python.h> @@ -53,5 +52,3 @@ int Nature_Init(PyObject *module); #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_NATURE_H__ */ diff --git a/source/blender/freestyle/intern/python/BPy_Operators.cpp b/source/blender/freestyle/intern/python/BPy_Operators.cpp index 510e823ba55..56f95b8ecbb 100644 --- a/source/blender/freestyle/intern/python/BPy_Operators.cpp +++ b/source/blender/freestyle/intern/python/BPy_Operators.cpp @@ -365,8 +365,8 @@ static PyObject *Operators_sequential_split(BPy_Operators * /*self*/, return NULL; } } - else if (PyErr_Clear(), - (f = 0.0f), + else if ((void)PyErr_Clear(), + (void)(f = 0.0f), PyArg_ParseTupleAndKeywords( args, kwds, "O!|f", (char **)kwlist_2, &UnaryPredicate0D_Type, &obj1, &f)) { if (!((BPy_UnaryPredicate0D *)obj1)->up0D) { @@ -484,8 +484,8 @@ static PyObject *Operators_recursive_split(BPy_Operators * /*self*/, return NULL; } } - else if (PyErr_Clear(), - (f = 0.0f), + else if ((void)PyErr_Clear(), + (void)(f = 0.0f), PyArg_ParseTupleAndKeywords(args, kwds, "O!O!O!|f", diff --git a/source/blender/freestyle/intern/python/BPy_Operators.h b/source/blender/freestyle/intern/python/BPy_Operators.h index 15797ca742e..3b060d63f3c 100644 --- a/source/blender/freestyle/intern/python/BPy_Operators.h +++ b/source/blender/freestyle/intern/python/BPy_Operators.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_OPERATORS_H__ -#define __FREESTYLE_PYTHON_OPERATORS_H__ +#pragma once extern "C" { #include <Python.h> @@ -53,5 +52,3 @@ int Operators_Init(PyObject *module); #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_OPERATORS_H__ */ diff --git a/source/blender/freestyle/intern/python/BPy_SShape.h b/source/blender/freestyle/intern/python/BPy_SShape.h index 55ef11b9a0b..9741a10f69e 100644 --- a/source/blender/freestyle/intern/python/BPy_SShape.h +++ b/source/blender/freestyle/intern/python/BPy_SShape.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_SSHAPE_H__ -#define __FREESTYLE_PYTHON_SSHAPE_H__ +#pragma once extern "C" { #include <Python.h> @@ -54,5 +53,3 @@ int SShape_Init(PyObject *module); #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_SSHAPE_H__ */ diff --git a/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp index 5f5407e82e3..214385f74ad 100644 --- a/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp +++ b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp @@ -110,7 +110,7 @@ static int StrokeAttribute_init(BPy_StrokeAttribute *self, PyObject *args, PyObj self->sa = new StrokeAttribute(*(((BPy_StrokeAttribute *)obj1)->sa)); } } - else if (PyErr_Clear(), + else if ((void)PyErr_Clear(), PyArg_ParseTupleAndKeywords(args, kwds, "O!O!f", @@ -123,7 +123,7 @@ static int StrokeAttribute_init(BPy_StrokeAttribute *self, PyObject *args, PyObj self->sa = new StrokeAttribute( *(((BPy_StrokeAttribute *)obj1)->sa), *(((BPy_StrokeAttribute *)obj2)->sa), t); } - else if (PyErr_Clear(), + else if ((void)PyErr_Clear(), PyArg_ParseTupleAndKeywords(args, kwds, "ffffff", diff --git a/source/blender/freestyle/intern/python/BPy_StrokeAttribute.h b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.h index 9e14c292c0a..9068eb4c7a3 100644 --- a/source/blender/freestyle/intern/python/BPy_StrokeAttribute.h +++ b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_STROKEATTRIBUTE_H__ -#define __FREESTYLE_PYTHON_STROKEATTRIBUTE_H__ +#pragma once extern "C" { #include <Python.h> @@ -56,5 +55,3 @@ void StrokeAttribute_mathutils_register_callback(); #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_STROKEATTRIBUTE_H__ */ diff --git a/source/blender/freestyle/intern/python/BPy_StrokeShader.h b/source/blender/freestyle/intern/python/BPy_StrokeShader.h index 23b1196fdb9..04fff8e8052 100644 --- a/source/blender/freestyle/intern/python/BPy_StrokeShader.h +++ b/source/blender/freestyle/intern/python/BPy_StrokeShader.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_STROKESHADER_H__ -#define __FREESTYLE_PYTHON_STROKESHADER_H__ +#pragma once extern "C" { #include <Python.h> @@ -58,5 +57,3 @@ int StrokeShader_Init(PyObject *module); #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_STROKESHADER_H__ */ diff --git a/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h b/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h index c0834859dc8..1319cabe94a 100644 --- a/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h +++ b/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_UNARYFUNCTION0D_H__ -#define __FREESTYLE_PYTHON_UNARYFUNCTION0D_H__ +#pragma once extern "C" { #include <Python.h> @@ -54,5 +53,3 @@ int UnaryFunction0D_Init(PyObject *module); #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_UNARYFUNCTION0D_H__ */ diff --git a/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h index dfd0e56beb6..331c3b4aaa1 100644 --- a/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h +++ b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_UNARYFUNCTION1D_H__ -#define __FREESTYLE_PYTHON_UNARYFUNCTION1D_H__ +#pragma once extern "C" { #include <Python.h> @@ -54,5 +53,3 @@ int UnaryFunction1D_Init(PyObject *module); #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_UNARYFUNCTION1D_H__ */ diff --git a/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.h b/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.h index d422b10f18e..2460b1f028b 100644 --- a/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.h +++ b/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_UNARYPREDICATE0D_H__ -#define __FREESTYLE_PYTHON_UNARYPREDICATE0D_H__ +#pragma once extern "C" { #include <Python.h> @@ -54,5 +53,3 @@ int UnaryPredicate0D_Init(PyObject *module); #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_UNARYPREDICATE0D_H__ */ diff --git a/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h index 22358fab525..8fad7f94caf 100644 --- a/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h +++ b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_UNARYPREDICATE1D_H__ -#define __FREESTYLE_PYTHON_UNARYPREDICATE1D_H__ +#pragma once extern "C" { #include <Python.h> @@ -54,5 +53,3 @@ int UnaryPredicate1D_Init(PyObject *module); #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_UNARYPREDICATE1D_H__ */ diff --git a/source/blender/freestyle/intern/python/BPy_ViewMap.h b/source/blender/freestyle/intern/python/BPy_ViewMap.h index fe1cd39deb3..59738b6dce9 100644 --- a/source/blender/freestyle/intern/python/BPy_ViewMap.h +++ b/source/blender/freestyle/intern/python/BPy_ViewMap.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_VIEWMAP_H__ -#define __FREESTYLE_PYTHON_VIEWMAP_H__ +#pragma once extern "C" { #include <Python.h> @@ -53,5 +52,3 @@ int ViewMap_Init(PyObject *module); #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_VIEWMAP_H__ */ diff --git a/source/blender/freestyle/intern/python/BPy_ViewShape.cpp b/source/blender/freestyle/intern/python/BPy_ViewShape.cpp index f59ae15ae01..2adcae13e6d 100644 --- a/source/blender/freestyle/intern/python/BPy_ViewShape.cpp +++ b/source/blender/freestyle/intern/python/BPy_ViewShape.cpp @@ -88,7 +88,7 @@ static int ViewShape_init(BPy_ViewShape *self, PyObject *args, PyObject *kwds) self->py_ss = ((BPy_ViewShape *)obj)->py_ss; } } - else if (PyErr_Clear(), + else if ((void)PyErr_Clear(), PyArg_ParseTupleAndKeywords(args, kwds, "O!", (char **)kwlist_2, &SShape_Type, &obj)) { BPy_SShape *py_ss = (BPy_SShape *)obj; self->vs = new ViewShape(py_ss->ss); diff --git a/source/blender/freestyle/intern/python/BPy_ViewShape.h b/source/blender/freestyle/intern/python/BPy_ViewShape.h index 3158353136f..bd51fd0d5cb 100644 --- a/source/blender/freestyle/intern/python/BPy_ViewShape.h +++ b/source/blender/freestyle/intern/python/BPy_ViewShape.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_VIEWSHAPE_H__ -#define __FREESTYLE_PYTHON_VIEWSHAPE_H__ +#pragma once extern "C" { #include <Python.h> @@ -57,5 +56,3 @@ int ViewShape_Init(PyObject *module); #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_VIEWSHAPE_H__ */ diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_FalseBP1D.h b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_FalseBP1D.h index abb9eca9b30..6d741400caa 100644 --- a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_FalseBP1D.h +++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_FalseBP1D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_FALSEBP1D_H__ -#define __FREESTYLE_PYTHON_FALSEBP1D_H__ +#pragma once #include "../BPy_BinaryPredicate1D.h" @@ -43,5 +42,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_FALSEBP1D_H__ */ diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_Length2DBP1D.h b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_Length2DBP1D.h index 6ad2373c570..755da249855 100644 --- a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_Length2DBP1D.h +++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_Length2DBP1D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_LENGTH2DBP1D_H__ -#define __FREESTYLE_PYTHON_LENGTH2DBP1D_H__ +#pragma once #include "../BPy_BinaryPredicate1D.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_LENGTH2DBP1D_H__ */ diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_SameShapeIdBP1D.h b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_SameShapeIdBP1D.h index 75fc5eaa271..08326706a53 100644 --- a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_SameShapeIdBP1D.h +++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_SameShapeIdBP1D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_SAMESHAPEIDBP1D_H__ -#define __FREESTYLE_PYTHON_SAMESHAPEIDBP1D_H__ +#pragma once #include "../BPy_BinaryPredicate1D.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_SAMESHAPEIDBP1D_H__ */ diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_TrueBP1D.h b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_TrueBP1D.h index ed6a783fa47..76f3487d7db 100644 --- a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_TrueBP1D.h +++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_TrueBP1D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_TRUEBP1D_H__ -#define __FREESTYLE_PYTHON_TRUEBP1D_H__ +#pragma once #include "../BPy_BinaryPredicate1D.h" @@ -43,5 +42,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_TRUEBP1D_H__ */ diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.h b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.h index 1a451a688fb..b9ce88773a8 100644 --- a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.h +++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_VIEWMAPGRADIENTNORMBP1D_H__ -#define __FREESTYLE_PYTHON_VIEWMAPGRADIENTNORMBP1D_H__ +#pragma once #include "../BPy_BinaryPredicate1D.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_VIEWMAPGRADIENTNORMBP1D_H__ */ diff --git a/source/blender/freestyle/intern/python/Director.h b/source/blender/freestyle/intern/python/Director.h index 5c087e411ff..468150524f1 100644 --- a/source/blender/freestyle/intern/python/Director.h +++ b/source/blender/freestyle/intern/python/Director.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_DIRECTOR_H__ -#define __FREESTYLE_PYTHON_DIRECTOR_H__ +#pragma once namespace Freestyle { class UnaryPredicate0D; @@ -63,5 +62,3 @@ int Director_BPy_StrokeShader_shade(StrokeShader *ss, Stroke &s); // ChainingIterator: init, traverse int Director_BPy_ChainingIterator_init(ChainingIterator *c_it); int Director_BPy_ChainingIterator_traverse(ChainingIterator *c_it, AdjacencyIterator &a_it); - -#endif // __FREESTYLE_PYTHON_DIRECTOR_H__ diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp b/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp index 6af80c4bfd9..81dd79ff270 100644 --- a/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp +++ b/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp @@ -95,7 +95,7 @@ static int CurvePoint_init(BPy_CurvePoint *self, PyObject *args, PyObject *kwds) self->cp = new CurvePoint(*(((BPy_CurvePoint *)obj1)->cp)); } } - else if (PyErr_Clear(), + else if ((void)PyErr_Clear(), PyArg_ParseTupleAndKeywords(args, kwds, "O!O!f", @@ -107,7 +107,7 @@ static int CurvePoint_init(BPy_CurvePoint *self, PyObject *args, PyObject *kwds) &t2d)) { self->cp = new CurvePoint(((BPy_SVertex *)obj1)->sv, ((BPy_SVertex *)obj2)->sv, t2d); } - else if (PyErr_Clear(), + else if ((void)PyErr_Clear(), PyArg_ParseTupleAndKeywords(args, kwds, "O!O!f", diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.h b/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.h index d0f4087f8a6..6a550085817 100644 --- a/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.h +++ b/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_CURVEPOINT_H__ -#define __FREESTYLE_PYTHON_CURVEPOINT_H__ +#pragma once #include "../BPy_Interface0D.h" @@ -46,5 +45,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_CURVEPOINT_H__ */ diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp index 71a87c2c01e..c01f1f17000 100644 --- a/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp +++ b/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp @@ -72,7 +72,7 @@ static int SVertex_init(BPy_SVertex *self, PyObject *args, PyObject *kwds) self->sv = new SVertex(*(((BPy_SVertex *)obj)->sv)); } } - else if (PyErr_Clear(), + else if ((void)PyErr_Clear(), PyArg_ParseTupleAndKeywords( args, kwds, "O&O!", (char **)kwlist_2, convert_v3, v, &Id_Type, &obj)) { Vec3r point_3d(v[0], v[1], v[2]); diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.h b/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.h index 20a14f1422c..8d24576a98f 100644 --- a/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.h +++ b/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_SVERTEX_H__ -#define __FREESTYLE_PYTHON_SVERTEX_H__ +#pragma once #include "../BPy_Interface0D.h" @@ -50,5 +49,3 @@ void SVertex_mathutils_register_callback(); #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_SVERTEX_H__ */ diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.h b/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.h index 6769efa4673..cb9815fb3d4 100644 --- a/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.h +++ b/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_VIEWVERTEX_H__ -#define __FREESTYLE_PYTHON_VIEWVERTEX_H__ +#pragma once #include "../BPy_Interface0D.h" @@ -46,5 +45,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_VIEWVERTEX_H__ */ diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp index b4c08714af0..519bd72db3b 100644 --- a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp +++ b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp @@ -107,7 +107,7 @@ static int StrokeVertex_init(BPy_StrokeVertex *self, PyObject *args, PyObject *k self->sv = new StrokeVertex(*(((BPy_StrokeVertex *)obj1)->sv)); } } - else if (PyErr_Clear(), + else if ((void)PyErr_Clear(), PyArg_ParseTupleAndKeywords(args, kwds, "O!O!f", @@ -129,7 +129,7 @@ static int StrokeVertex_init(BPy_StrokeVertex *self, PyObject *args, PyObject *k } self->sv = new StrokeVertex(sv1, sv2, t3d); } - else if (PyErr_Clear(), + else if ((void)PyErr_Clear(), PyArg_ParseTupleAndKeywords( args, kwds, "O!", (char **)kwlist_3, &CurvePoint_Type, &obj1)) { CurvePoint *cp = ((BPy_CurvePoint *)obj1)->cp; @@ -139,8 +139,8 @@ static int StrokeVertex_init(BPy_StrokeVertex *self, PyObject *args, PyObject *k } self->sv = new StrokeVertex(cp); } - else if (PyErr_Clear(), - (obj2 = 0), + else if ((void)PyErr_Clear(), + (void)(obj2 = 0), PyArg_ParseTupleAndKeywords(args, kwds, "O!|O!", diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.h b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.h index e2eab6ab887..44da0ed212a 100644 --- a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.h +++ b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_STROKEVERTEX_H__ -#define __FREESTYLE_PYTHON_STROKEVERTEX_H__ +#pragma once #include "../BPy_CurvePoint.h" @@ -51,5 +50,3 @@ void StrokeVertex_mathutils_register_callback(); #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_STROKEVERTEX_H__ */ diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.h b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.h index fdea985a125..43f2c2b4a5c 100644 --- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.h +++ b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_NONTVERTEX_H__ -#define __FREESTYLE_PYTHON_NONTVERTEX_H__ +#pragma once #include "../BPy_ViewVertex.h" @@ -46,5 +45,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_NONTVERTEX_H__ */ diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.h b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.h index 165ad976fdf..253934bb4e7 100644 --- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.h +++ b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_TVERTEX_H__ -#define __FREESTYLE_PYTHON_TVERTEX_H__ +#pragma once #include "../BPy_ViewVertex.h" @@ -46,5 +45,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_TVERTEX_H__ */ diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp index 8a09e7722ea..187ab94360a 100644 --- a/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp @@ -81,7 +81,7 @@ static int FEdge_init(BPy_FEdge *self, PyObject *args, PyObject *kwds) self->fe = new FEdge(*(((BPy_FEdge *)obj1)->fe)); } } - else if (PyErr_Clear(), + else if ((void)PyErr_Clear(), PyArg_ParseTupleAndKeywords(args, kwds, "O!O!", diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.h b/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.h index 3ab8c5f8273..25b1bc99860 100644 --- a/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.h +++ b/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_FEDGE_H__ -#define __FREESTYLE_PYTHON_FEDGE_H__ +#pragma once #include "../BPy_Interface1D.h" @@ -46,5 +45,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_FEDGE_H__ */ diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp index fd434f9c4ef..788dfa78992 100644 --- a/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp @@ -72,7 +72,7 @@ static int FrsCurve_init(BPy_FrsCurve *self, PyObject *args, PyObject *kwds) self->c = new Curve(*(((BPy_FrsCurve *)obj)->c)); } } - else if (PyErr_Clear(), + else if ((void)PyErr_Clear(), PyArg_ParseTupleAndKeywords(args, kwds, "O!", (char **)kwlist_2, &Id_Type, &obj)) { self->c = new Curve(*(((BPy_Id *)obj)->id)); } diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.h b/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.h index aa4fb409076..9bdc3919a38 100644 --- a/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.h +++ b/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_FRSCURVE_H__ -#define __FREESTYLE_PYTHON_FRSCURVE_H__ +#pragma once #include "../BPy_Interface1D.h" @@ -46,5 +45,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_FRSCURVE_H__ */ diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp index 3a25ddb0252..b31efe1f923 100644 --- a/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp @@ -157,7 +157,8 @@ static PyObject *Stroke_resample(BPy_Stroke *self, PyObject *args, PyObject *kwd return NULL; } } - else if (PyErr_Clear(), PyArg_ParseTupleAndKeywords(args, kwds, "f", (char **)kwlist_2, &f)) { + else if ((void)PyErr_Clear(), + PyArg_ParseTupleAndKeywords(args, kwds, "f", (char **)kwlist_2, &f)) { if (self->s->Resample(f) < 0) { PyErr_SetString(PyExc_RuntimeError, "Stroke resampling (by vertex interval) failed"); return NULL; diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.h b/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.h index a08905e6043..33c6aa70f91 100644 --- a/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.h +++ b/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_STROKE_H__ -#define __FREESTYLE_PYTHON_STROKE_H__ +#pragma once #include "../BPy_Interface1D.h" @@ -46,5 +45,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_STROKE_H__ */ diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.h b/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.h index c02d5d0f21b..519081cedbd 100644 --- a/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.h +++ b/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_VIEWEDGE_H__ -#define __FREESTYLE_PYTHON_VIEWEDGE_H__ +#pragma once #include "../BPy_Interface1D.h" @@ -46,5 +45,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_VIEWEDGE_H__ */ diff --git a/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.cpp b/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.cpp index 285100193d3..9cdc344081e 100644 --- a/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.cpp @@ -71,7 +71,7 @@ static int Chain_init(BPy_Chain *self, PyObject *args, PyObject *kwds) self->c = new Chain(*(((BPy_Chain *)obj)->c)); } } - else if (PyErr_Clear(), + else if ((void)PyErr_Clear(), PyArg_ParseTupleAndKeywords(args, kwds, "O!", (char **)kwlist_2, &Id_Type, &obj)) { self->c = new Chain(*(((BPy_Id *)obj)->id)); } diff --git a/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.h b/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.h index a9392cd81bf..73da253688c 100644 --- a/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.h +++ b/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_CHAIN_H__ -#define __FREESTYLE_PYTHON_CHAIN_H__ +#pragma once #include "../BPy_FrsCurve.h" @@ -46,5 +45,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_CHAIN_H__ */ diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp index 725daa80b5e..5db75c84608 100644 --- a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp @@ -75,7 +75,7 @@ static int FEdgeSharp_init(BPy_FEdgeSharp *self, PyObject *args, PyObject *kwds) self->fes = new FEdgeSharp(*(((BPy_FEdgeSharp *)obj1)->fes)); } } - else if (PyErr_Clear(), + else if ((void)PyErr_Clear(), PyArg_ParseTupleAndKeywords(args, kwds, "O!O!", diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.h b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.h index 450539acb16..2b8b09a5990 100644 --- a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.h +++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_FEDGESHARP_H__ -#define __FREESTYLE_PYTHON_FEDGESHARP_H__ +#pragma once #include "../BPy_FEdge.h" @@ -50,5 +49,3 @@ void FEdgeSharp_mathutils_register_callback(); #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_FEDGESHARP_H__ */ diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp index 65d9dcbe01f..3fb739b18db 100644 --- a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp @@ -73,7 +73,7 @@ static int FEdgeSmooth_init(BPy_FEdgeSmooth *self, PyObject *args, PyObject *kwd self->fes = new FEdgeSmooth(*(((BPy_FEdgeSmooth *)obj1)->fes)); } } - else if (PyErr_Clear(), + else if ((void)PyErr_Clear(), PyArg_ParseTupleAndKeywords(args, kwds, "O!O!", diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.h b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.h index 901741a76ff..97497281310 100644 --- a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.h +++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_FEDGESMOOTH_H__ -#define __FREESTYLE_PYTHON_FEDGESMOOTH_H__ +#pragma once #include "../BPy_FEdge.h" @@ -51,5 +50,3 @@ void FEdgeSmooth_mathutils_register_callback(); #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_FEDGESMOOTH_H__ */ diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp index 74ae7809284..90e751333b9 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp @@ -82,8 +82,8 @@ static int AdjacencyIterator_init(BPy_AdjacencyIterator *self, PyObject *args, P self->at_start = ((BPy_AdjacencyIterator *)obj1)->at_start; } } - else if (PyErr_Clear(), - (obj2 = obj3 = 0), + else if ((void)PyErr_Clear(), + (void)(obj2 = obj3 = 0), PyArg_ParseTupleAndKeywords(args, kwds, "O!|O!O!", diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.h index 9a360f23f0a..e5332e0d180 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.h +++ b/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_ADJACENCYITERATOR_H__ -#define __FREESTYLE_PYTHON_ADJACENCYITERATOR_H__ +#pragma once #include "../BPy_Iterator.h" @@ -48,5 +47,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_ADJACENCYITERATOR_H__ */ diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp index 164e1646934..1703fc2bddb 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp @@ -114,8 +114,8 @@ static int ChainPredicateIterator_init(BPy_ChainPredicateIterator *self, Py_INCREF(self->upred); Py_INCREF(self->bpred); } - else if (PyErr_Clear(), - (obj3 = obj4 = obj5 = obj6 = 0), + else if ((void)PyErr_Clear(), + (void)(obj3 = obj4 = obj5 = obj6 = 0), PyArg_ParseTupleAndKeywords(args, kwds, "O!O!|O!O!O&O!", diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.h index 645e6573257..ece8018d285 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.h +++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_CHAINPREDICATEITERATOR_H__ -#define __FREESTYLE_PYTHON_CHAINPREDICATEITERATOR_H__ +#pragma once #include "BPy_ChainingIterator.h" @@ -49,5 +48,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_CHAINPREDICATEITERATOR_H__ */ diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp index 401959be0c0..d8ad82d667c 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp @@ -91,8 +91,8 @@ static int ChainSilhouetteIterator_init(BPy_ChainSilhouetteIterator *self, args, kwds, "O!", (char **)kwlist_1, &ChainSilhouetteIterator_Type, &obj1)) { self->cs_it = new ChainSilhouetteIterator(*(((BPy_ChainSilhouetteIterator *)obj1)->cs_it)); } - else if (PyErr_Clear(), - (obj1 = obj2 = obj3 = 0), + else if ((void)PyErr_Clear(), + (void)(obj1 = obj2 = obj3 = 0), PyArg_ParseTupleAndKeywords(args, kwds, "|O!O&O!", diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.h index 72823832441..f91d0fb2585 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.h +++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_CHAINSILHOUETTEITERATOR_H__ -#define __FREESTYLE_PYTHON_CHAINSILHOUETTEITERATOR_H__ +#pragma once #include "BPy_ChainingIterator.h" @@ -47,5 +46,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_CHAINSILHOUETTEITERATOR_H__ */ diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp index b6d841c5b64..dbd6e8dd09d 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp @@ -91,8 +91,8 @@ static int ChainingIterator___init__(BPy_ChainingIterator *self, PyObject *args, args, kwds, "O!", (char **)kwlist_1, &ChainingIterator_Type, &obj1)) { self->c_it = new ChainingIterator(*(((BPy_ChainingIterator *)obj1)->c_it)); } - else if (PyErr_Clear(), - (obj1 = obj2 = obj3 = obj4 = 0), + else if ((void)PyErr_Clear(), + (void)(obj1 = obj2 = obj3 = obj4 = 0), PyArg_ParseTupleAndKeywords(args, kwds, "|O!O!O&O!", diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.h index 7e3be0bc6cd..e950824764c 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.h +++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_CHAININGITERATOR_H__ -#define __FREESTYLE_PYTHON_CHAININGITERATOR_H__ +#pragma once #include "BPy_ViewEdgeIterator.h" @@ -47,5 +46,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_CHAININGITERATOR_H__ */ diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp index 6ea61a060cb..6c496b0308b 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp @@ -75,7 +75,8 @@ static int CurvePointIterator_init(BPy_CurvePointIterator *self, PyObject *args, *(((BPy_CurvePointIterator *)brother)->cp_it)); } } - else if (PyErr_Clear(), PyArg_ParseTupleAndKeywords(args, kwds, "f", (char **)kwlist_2, &step)) { + else if ((void)PyErr_Clear(), + PyArg_ParseTupleAndKeywords(args, kwds, "f", (char **)kwlist_2, &step)) { self->cp_it = new CurveInternal::CurvePointIterator(step); } else { diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.h index aa84b1020ce..db36bf386ec 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.h +++ b/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_CURVEPOINTITERATOR_H__ -#define __FREESTYLE_PYTHON_CURVEPOINTITERATOR_H__ +#pragma once #include "../BPy_Iterator.h" @@ -47,5 +46,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_CURVEPOINTITERATOR_H__ */ diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp index 0dbef9f325c..734ed0117f4 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp @@ -81,14 +81,14 @@ static int Interface0DIterator_init(BPy_Interface0DIterator *self, PyObject *arg self->at_start = true; self->reversed = false; } - else if (PyErr_Clear(), + else if ((void)PyErr_Clear(), PyArg_ParseTupleAndKeywords( args, kwds, "O!", (char **)kwlist_2, &Interface1D_Type, &inter)) { self->if0D_it = new Interface0DIterator(((BPy_Interface1D *)inter)->if1D->verticesBegin()); self->at_start = true; self->reversed = false; } - else if (PyErr_Clear(), + else if ((void)PyErr_Clear(), PyArg_ParseTupleAndKeywords( args, kwds, "O!", (char **)kwlist_3, &Interface0DIterator_Type, &brother)) { self->if0D_it = new Interface0DIterator(*(((BPy_Interface0DIterator *)brother)->if0D_it)); @@ -124,7 +124,7 @@ static PyObject *Interface0DIterator_iternext(BPy_Interface0DIterator *self) PyErr_SetNone(PyExc_StopIteration); return NULL; } - else if (self->at_start) { + if (self->at_start) { self->at_start = false; } else if (self->if0D_it->atLast()) { diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.h index 3695cda6c76..663193bedee 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.h +++ b/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_INTERFACE0DITERATOR_H__ -#define __FREESTYLE_PYTHON_INTERFACE0DITERATOR_H__ +#pragma once #include "../BPy_Iterator.h" @@ -49,5 +48,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_INTERFACE0DITERATOR_H__ */ diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp index dd738b97473..4a5927ff6eb 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp @@ -82,7 +82,7 @@ static int SVertexIterator_init(BPy_SVertexIterator *self, PyObject *args, PyObj self->sv_it = new ViewEdgeInternal::SVertexIterator(*(((BPy_SVertexIterator *)obj1)->sv_it)); } } - else if (PyErr_Clear(), + else if ((void)PyErr_Clear(), PyArg_ParseTupleAndKeywords(args, kwds, "O!O!O!O!f", diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.h index 2a3bfa6baf9..a34dc7a63c5 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.h +++ b/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_SVERTEXITERATOR_H__ -#define __FREESTYLE_PYTHON_SVERTEXITERATOR_H__ +#pragma once #include "../BPy_Iterator.h" @@ -47,5 +46,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_SVERTEXITERATOR_H__ */ diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp index 84f57f1fe31..cda4031240b 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp @@ -74,7 +74,7 @@ static int StrokeVertexIterator_init(BPy_StrokeVertexIterator *self, self->at_start = ((BPy_StrokeVertexIterator *)brother)->at_start; } - else if (PyErr_Clear(), + else if ((void)PyErr_Clear(), PyArg_ParseTupleAndKeywords( args, kwds, "|O!", (char **)kwlist_2, &Stroke_Type, &stroke)) { if (!stroke) { @@ -125,7 +125,7 @@ static PyObject *StrokeVertexIterator_iternext(BPy_StrokeVertexIterator *self) } /* If at the start of the iterator, only return the object * and don't increment, to keep for-loops in sync */ - else if (self->at_start) { + if (self->at_start) { self->at_start = false; } /* If sv_it.atLast() is true, the iterator is currently pointing to the final valid element. diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.h index 04bca16337d..629471a664c 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.h +++ b/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_STROKEVERTEXITERATOR_H__ -#define __FREESTYLE_PYTHON_STROKEVERTEXITERATOR_H__ +#pragma once #include "../BPy_Iterator.h" @@ -50,5 +49,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_STROKEVERTEXITERATOR_H__ */ diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp index c8a978784a4..3d0ed5d5a4d 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp @@ -78,8 +78,8 @@ static int ViewEdgeIterator_init(BPy_ViewEdgeIterator *self, PyObject *args, PyO args, kwds, "O!", (char **)kwlist_1, &ViewEdgeIterator_Type, &obj1)) { self->ve_it = new ViewEdgeInternal::ViewEdgeIterator(*(((BPy_ViewEdgeIterator *)obj1)->ve_it)); } - else if (PyErr_Clear(), - (obj1 = obj2 = 0), + else if ((void)PyErr_Clear(), + (void)(obj1 = obj2 = 0), PyArg_ParseTupleAndKeywords( args, kwds, "|O&O!", (char **)kwlist_2, check_begin, &obj1, &PyBool_Type, &obj2)) { ViewEdge *begin = (!obj1 || obj1 == Py_None) ? NULL : ((BPy_ViewEdge *)obj1)->ve; diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.h index c9061d30e07..7169a13f328 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.h +++ b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_VIEWEDGEITERATOR_H__ -#define __FREESTYLE_PYTHON_VIEWEDGEITERATOR_H__ +#pragma once #include "../BPy_Iterator.h" @@ -47,5 +46,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_VIEWEDGEITERATOR_H__ */ diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.h index 179e315b1be..7a13f6d2c72 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.h +++ b/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_ORIENTEDVIEWEDGEITERATOR_H__ -#define __FREESTYLE_PYTHON_ORIENTEDVIEWEDGEITERATOR_H__ +#pragma once #include "../BPy_Iterator.h" @@ -49,5 +48,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_ORIENTEDVIEWEDGEITERATOR_H__ */ diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.h index c37d330e4a7..bd63b2fb337 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_BACKBONESTRETCHERSHADER_H__ -#define __FREESTYLE_PYTHON_BACKBONESTRETCHERSHADER_H__ +#pragma once #include "../BPy_StrokeShader.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_BACKBONESTRETCHERSHADER_H__ */ diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.h index b38fcec838d..a0b80b401ba 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_BEZIERCURVESHADER_H__ -#define __FREESTYLE_PYTHON_BEZIERCURVESHADER_H__ +#pragma once #include "../BPy_StrokeShader.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_BEZIERCURVESHADER_H__ */ diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_BlenderTextureShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_BlenderTextureShader.h index 35335ffc023..7147a542467 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_BlenderTextureShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_BlenderTextureShader.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_BLENDERTEXTURESHADER_H__ -#define __FREESTYLE_PYTHON_BLENDERTEXTURESHADER_H__ +#pragma once #include "../BPy_StrokeShader.h" @@ -46,5 +45,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_BLENDERTEXTURESHADER_H__ */ diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.h index 35a94a1620d..b64e1b9376e 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_CALLIGRAPHICSHADER_H__ -#define __FREESTYLE_PYTHON_CALLIGRAPHICSHADER_H__ +#pragma once #include "../BPy_StrokeShader.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_CALLIGRAPHICSHADER_H__ */ diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.h index 054479d916d..ada3165eea9 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_COLORNOISESHADER_H__ -#define __FREESTYLE_PYTHON_COLORNOISESHADER_H__ +#pragma once #include "../BPy_StrokeShader.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_COLORNOISESHADER_H__ */ diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.h index 36b59e6493e..7f58ed53e96 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_CONSTANTCOLORSHADER_H__ -#define __FREESTYLE_PYTHON_CONSTANTCOLORSHADER_H__ +#pragma once #include "../BPy_StrokeShader.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_CONSTANTCOLORSHADER_H__ */ diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.h index 3a11ab9c9a0..9323e2b9143 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_CONSTANTTHICKNESSSHADER_H__ -#define __FREESTYLE_PYTHON_CONSTANTTHICKNESSSHADER_H__ +#pragma once #include "../BPy_StrokeShader.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_CONSTANTTHICKNESSSHADER_H__ */ diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.h index 04912499c04..e3946c4bedb 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_CONSTRAINEDINCREASINGTHICKNESSSHADER_H__ -#define __FREESTYLE_PYTHON_CONSTRAINEDINCREASINGTHICKNESSSHADER_H__ +#pragma once #include "../BPy_StrokeShader.h" @@ -45,5 +44,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_CONSTRAINEDINCREASINGTHICKNESSSHADER_H__ */ diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.h index 217acbc4648..51fd37978d5 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_GUIDINGLINESSHADER_H__ -#define __FREESTYLE_PYTHON_GUIDINGLINESSHADER_H__ +#pragma once #include "../BPy_StrokeShader.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_GUIDINGLINESSHADER_H__ */ diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.h index d7d1d053efd..def647abcce 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_INCREASINGCOLORSHADER_H__ -#define __FREESTYLE_PYTHON_INCREASINGCOLORSHADER_H__ +#pragma once #include "../BPy_StrokeShader.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_INCREASINGCOLORSHADER_H__ */ diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.h index 28636263813..7ded1c81beb 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_INCREASINGTHICKNESSSHADER_H__ -#define __FREESTYLE_PYTHON_INCREASINGTHICKNESSSHADER_H__ +#pragma once #include "../BPy_StrokeShader.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_INCREASINGTHICKNESSSHADER_H__ */ diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.h index e44ca1caa51..c50b388965a 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_POLYGONALIZATIONSHADER_H__ -#define __FREESTYLE_PYTHON_POLYGONALIZATIONSHADER_H__ +#pragma once #include "../BPy_StrokeShader.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_POLYGONALIZATIONSHADER_H__ */ diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.h index 50dbae6916e..073c5e8df42 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_SAMPLINGSHADER_H__ -#define __FREESTYLE_PYTHON_SAMPLINGSHADER_H__ +#pragma once #include "../BPy_StrokeShader.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_SAMPLINGSHADER_H__ */ diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_SmoothingShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_SmoothingShader.cpp index 51a0c670d75..9e2726061c3 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_SmoothingShader.cpp +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_SmoothingShader.cpp @@ -35,9 +35,9 @@ static char SmoothingShader___doc__[] = "\n" "[Geometry shader]\n" "\n" - ".. method:: __init__(num_iterations=100, factor_point=0.1,\n" - " factor_curvature=0.0, factor_curvature_difference=0.2,\n" - " aniso_point=0.0, aniso_normal=0.0, aniso_curvature=0.0,\n" + ".. method:: __init__(num_iterations=100, factor_point=0.1, \\\n" + " factor_curvature=0.0, factor_curvature_difference=0.2, \\\n" + " aniso_point=0.0, aniso_normal=0.0, aniso_curvature=0.0, \\\n" " carricature_factor=1.0)\n" "\n" " Builds a SmoothingShader object.\n" diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_SmoothingShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_SmoothingShader.h index 4b553d76770..fcd559b661d 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_SmoothingShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_SmoothingShader.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHONSMOOTHINGSHADER_H__ -#define __FREESTYLE_PYTHONSMOOTHINGSHADER_H__ +#pragma once #include "../BPy_StrokeShader.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHONSMOOTHINGSHADER_H__ */ diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.h index 7e5e644c46f..59e3e32d6cf 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_SPATIALNOISESHADER_H__ -#define __FREESTYLE_PYTHON_SPATIALNOISESHADER_H__ +#pragma once #include "../BPy_StrokeShader.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_SPATIALNOISESHADER_H__ */ diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureStepShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureStepShader.h index d53ca139b2b..ef0ebfad883 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureStepShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureStepShader.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_STROKETEXTURESTEPSHADER_H__ -#define __FREESTYLE_PYTHON_STROKETEXTURESTEPSHADER_H__ +#pragma once #include "../BPy_StrokeShader.h" @@ -46,5 +45,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_STROKETEXTURESTEPSHADER_H__ */ diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.h index 1a42985b245..e18f60c033b 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_THICKNESSNOISESHADER_H__ -#define __FREESTYLE_PYTHON_THICKNESSNOISESHADER_H__ +#pragma once #include "../BPy_StrokeShader.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_THICKNESSNOISESHADER_H__ */ diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.h index a82be691c81..bc7c2a2f2f4 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_TIPREMOVERSHADER_H__ -#define __FREESTYLE_PYTHON_TIPREMOVERSHADER_H__ +#pragma once #include "../BPy_StrokeShader.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_TIPREMOVERSHADER_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.h b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.h index 8abccd27591..60ebc646d74 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_UNARYFUNCTION0DDOUBLE_H__ -#define __FREESTYLE_PYTHON_UNARYFUNCTION0DDOUBLE_H__ +#pragma once #include "../BPy_UnaryFunction0D.h" @@ -48,5 +47,3 @@ int UnaryFunction0DDouble_Init(PyObject *module); #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_UNARYFUNCTION0DDOUBLE_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.h b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.h index 5a92142c88a..9ce4b3bfd0b 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_UNARYFUNCTION0DEDGENATURE_H__ -#define __FREESTYLE_PYTHON_UNARYFUNCTION0DEDGENATURE_H__ +#pragma once #include "../BPy_UnaryFunction0D.h" @@ -50,5 +49,3 @@ int UnaryFunction0DEdgeNature_Init(PyObject *module); #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_UNARYFUNCTION0DEDGENATURE_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.h b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.h index 53dc88d0e21..fd221201d99 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_UNARYFUNCTION0DFLOAT_H__ -#define __FREESTYLE_PYTHON_UNARYFUNCTION0DFLOAT_H__ +#pragma once #include "../BPy_UnaryFunction0D.h" @@ -48,5 +47,3 @@ int UnaryFunction0DFloat_Init(PyObject *module); #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_UNARYFUNCTION0DFLOAT_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.h b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.h index a8887b081ce..14e5d48ce43 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_UNARYFUNCTION0DID_H__ -#define __FREESTYLE_PYTHON_UNARYFUNCTION0DID_H__ +#pragma once #include "../BPy_UnaryFunction0D.h" @@ -50,5 +49,3 @@ int UnaryFunction0DId_Init(PyObject *module); #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_UNARYFUNCTION0DID_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.h b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.h index 558719032f8..bbd53c409eb 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_UNARYFUNCTION0DMATERIAL_H__ -#define __FREESTYLE_PYTHON_UNARYFUNCTION0DMATERIAL_H__ +#pragma once #include "../BPy_UnaryFunction0D.h" @@ -50,5 +49,3 @@ int UnaryFunction0DMaterial_Init(PyObject *module); #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_UNARYFUNCTION0DMATERIAL_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.h b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.h index ac09b51eceb..1a466ffc673 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_UNARYFUNCTION0DUNSIGNED_H__ -#define __FREESTYLE_PYTHON_UNARYFUNCTION0DUNSIGNED_H__ +#pragma once #include "../BPy_UnaryFunction0D.h" @@ -48,5 +47,3 @@ int UnaryFunction0DUnsigned_Init(PyObject *module); #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_UNARYFUNCTION0DUNSIGNED_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.h b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.h index 1639e1a5356..6c3d5fc85cc 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_UNARYFUNCTION0DVEC2F_H__ -#define __FREESTYLE_PYTHON_UNARYFUNCTION0DVEC2F_H__ +#pragma once #include "../BPy_UnaryFunction0D.h" @@ -51,5 +50,3 @@ int UnaryFunction0DVec2f_Init(PyObject *module); #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_UNARYFUNCTION0DVEC2F_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.h b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.h index 0f3bcc51f2e..4be9b170311 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_UNARYFUNCTION0DVEC3F_H__ -#define __FREESTYLE_PYTHON_UNARYFUNCTION0DVEC3F_H__ +#pragma once #include "../BPy_UnaryFunction0D.h" @@ -51,5 +50,3 @@ int UnaryFunction0DVec3f_Init(PyObject *module); #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_UNARYFUNCTION0DVEC3F_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.h b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.h index 4f559a09ba9..2a36ae21002 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_UNARYFUNCTION0DVECTORVIEWSHAPE_H__ -#define __FREESTYLE_PYTHON_UNARYFUNCTION0DVECTORVIEWSHAPE_H__ +#pragma once #include "../BPy_UnaryFunction0D.h" @@ -53,5 +52,3 @@ int UnaryFunction0DVectorViewShape_Init(PyObject *module); #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_UNARYFUNCTION0DVECTORVIEWSHAPE_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.h b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.h index af3661669bd..8a8dcdceb1f 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_UNARYFUNCTION0DVIEWSHAPE_H__ -#define __FREESTYLE_PYTHON_UNARYFUNCTION0DVIEWSHAPE_H__ +#pragma once #include "../BPy_UnaryFunction0D.h" @@ -50,5 +49,3 @@ int UnaryFunction0DViewShape_Init(PyObject *module); #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_UNARYFUNCTION0DVIEWSHAPE_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/BPy_ShapeIdF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/BPy_ShapeIdF0D.h index 1aea0736c9b..ce4b448df03 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/BPy_ShapeIdF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/BPy_ShapeIdF0D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_SHAPEIDF0D_H__ -#define __FREESTYLE_PYTHON_SHAPEIDF0D_H__ +#pragma once #include "../BPy_UnaryFunction0DId.h" @@ -43,5 +42,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_SHAPEIDF0D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.h index f1520fa63ee..b569b9e1e81 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_MATERIALF0D_H__ -#define __FREESTYLE_PYTHON_MATERIALF0D_H__ +#pragma once #include "../BPy_UnaryFunction0DMaterial.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_MATERIALF0D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/BPy_CurveNatureF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/BPy_CurveNatureF0D.h index f24e63d09f9..5e29845c6b9 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/BPy_CurveNatureF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/BPy_CurveNatureF0D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_CURVENATUREF0D_H__ -#define __FREESTYLE_PYTHON_CURVENATUREF0D_H__ +#pragma once #include "../BPy_UnaryFunction0DEdgeNature.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_CURVENATUREF0D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_Normal2DF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_Normal2DF0D.h index 45a4ec3124d..c9b10412f34 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_Normal2DF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_Normal2DF0D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_NORMAL2DF0D_H__ -#define __FREESTYLE_PYTHON_NORMAL2DF0D_H__ +#pragma once #include "../BPy_UnaryFunction0DVec2f.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_NORMAL2DF0D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_VertexOrientation2DF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_VertexOrientation2DF0D.h index 8e76c31ff27..036bc82b52a 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_VertexOrientation2DF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_VertexOrientation2DF0D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_VERTEXORIENTATION2DF0D_H__ -#define __FREESTYLE_PYTHON_VERTEXORIENTATION2DF0D_H__ +#pragma once #include "../BPy_UnaryFunction0DVec2f.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_VERTEXORIENTATION2DF0D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/BPy_VertexOrientation3DF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/BPy_VertexOrientation3DF0D.h index 391f7c9536b..c99c344d470 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/BPy_VertexOrientation3DF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/BPy_VertexOrientation3DF0D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_VERTEXORIENTATION3DF0D_H__ -#define __FREESTYLE_PYTHON_VERTEXORIENTATION3DF0D_H__ +#pragma once #include "../BPy_UnaryFunction0DVec3f.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_VERTEXORIENTATION3DF0D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetOccludeeF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetOccludeeF0D.h index 45c9524e185..20ca0499a1e 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetOccludeeF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetOccludeeF0D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_GETOCCLUDEEF0D_H__ -#define __FREESTYLE_PYTHON_GETOCCLUDEEF0D_H__ +#pragma once #include "../BPy_UnaryFunction0DViewShape.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_GETOCCLUDEEF0D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetShapeF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetShapeF0D.h index c1db8c1219a..4e6dd6b9f60 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetShapeF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetShapeF0D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_GETSHAPEF0D_H__ -#define __FREESTYLE_PYTHON_GETSHAPEF0D_H__ +#pragma once #include "../BPy_UnaryFunction0DViewShape.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_GETSHAPEF0D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_Curvature2DAngleF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_Curvature2DAngleF0D.h index b57119257b9..6fcafef8143 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_Curvature2DAngleF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_Curvature2DAngleF0D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_CURVATURE2DANGLEF0D_H__ -#define __FREESTYLE_PYTHON_CURVATURE2DANGLEF0D_H__ +#pragma once #include "../BPy_UnaryFunction0DDouble.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_CURVATURE2DANGLEF0D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_DensityF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_DensityF0D.h index 34bbd8331fb..8df2f67aff3 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_DensityF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_DensityF0D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_DENSITYF0D_H__ -#define __FREESTYLE_PYTHON_DENSITYF0D_H__ +#pragma once #include "../BPy_UnaryFunction0DDouble.h" @@ -43,5 +42,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_DENSITYF0D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedXF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedXF0D.h index ddd500f617e..cf5adf216fc 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedXF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedXF0D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_GETPROJECTEDXF0D_H__ -#define __FREESTYLE_PYTHON_GETPROJECTEDXF0D_H__ +#pragma once #include "../BPy_UnaryFunction0DDouble.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_GETPROJECTEDXF0D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedYF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedYF0D.h index 8fccf14971f..6293f9daa24 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedYF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedYF0D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_GETPROJECTEDYF0D_H__ -#define __FREESTYLE_PYTHON_GETPROJECTEDYF0D_H__ +#pragma once #include "../BPy_UnaryFunction0DDouble.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_GETPROJECTEDYF0D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedZF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedZF0D.h index eecf69adb12..edae33e4c85 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedZF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedZF0D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_GETPROJECTEDZF0D_H__ -#define __FREESTYLE_PYTHON_GETPROJECTEDZF0D_H__ +#pragma once #include "../BPy_UnaryFunction0DDouble.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_GETPROJECTEDZF0D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetXF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetXF0D.h index 745bd5c628d..e0427fb1ccd 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetXF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetXF0D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_GETXF0D_H__ -#define __FREESTYLE_PYTHON_GETXF0D_H__ +#pragma once #include "../BPy_UnaryFunction0DDouble.h" @@ -43,5 +42,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_GETXF0D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetYF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetYF0D.h index 437ec573585..3f4f3c85dc7 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetYF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetYF0D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_GETYF0D_H__ -#define __FREESTYLE_PYTHON_GETYF0D_H__ +#pragma once #include "../BPy_UnaryFunction0DDouble.h" @@ -43,5 +42,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_GETYF0D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetZF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetZF0D.h index 840303fa59d..54a451e81f4 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetZF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetZF0D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_GETZF0D_H__ -#define __FREESTYLE_PYTHON_GETZF0D_H__ +#pragma once #include "../BPy_UnaryFunction0DDouble.h" @@ -43,5 +42,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_GETZF0D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_LocalAverageDepthF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_LocalAverageDepthF0D.h index f8072427d47..85626895d20 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_LocalAverageDepthF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_LocalAverageDepthF0D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_LOCALAVERAGEDEPTHF0D_H__ -#define __FREESTYLE_PYTHON_LOCALAVERAGEDEPTHF0D_H__ +#pragma once #include "../BPy_UnaryFunction0DDouble.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_LOCALAVERAGEDEPTHF0D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.h index d0aed95fc1a..fe2f333da37 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_ZDISCONTINUITYF0D_H__ -#define __FREESTYLE_PYTHON_ZDISCONTINUITYF0D_H__ +#pragma once #include "../BPy_UnaryFunction0DDouble.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_ZDISCONTINUITYF0D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetCurvilinearAbscissaF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetCurvilinearAbscissaF0D.h index 72238cfc255..8fffe3fd51d 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetCurvilinearAbscissaF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetCurvilinearAbscissaF0D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_GETCURVILINEARABSCISSAF0D_H__ -#define __FREESTYLE_PYTHON_GETCURVILINEARABSCISSAF0D_H__ +#pragma once #include "../BPy_UnaryFunction0DFloat.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_GETCURVILINEARABSCISSAF0D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetParameterF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetParameterF0D.h index 4fdb6419f21..3346b519e60 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetParameterF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetParameterF0D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_GETPARAMETERF0D_H__ -#define __FREESTYLE_PYTHON_GETPARAMETERF0D_H__ +#pragma once #include "../BPy_UnaryFunction0DFloat.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_GETPARAMETERF0D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetViewMapGradientNormF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetViewMapGradientNormF0D.h index 6ed42ee8019..de4930912f4 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetViewMapGradientNormF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetViewMapGradientNormF0D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_GETVIEWMAPGRADIENTNORMF0D_H__ -#define __FREESTYLE_PYTHON_GETVIEWMAPGRADIENTNORMF0D_H__ +#pragma once #include "../BPy_UnaryFunction0DFloat.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_GETVIEWMAPGRADIENTNORMF0D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadCompleteViewMapPixelF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadCompleteViewMapPixelF0D.h index 48d36543ca0..ceee0151771 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadCompleteViewMapPixelF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadCompleteViewMapPixelF0D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_READCOMPLETEVIEWMAPPIXELF0D_H__ -#define __FREESTYLE_PYTHON_READCOMPLETEVIEWMAPPIXELF0D_H__ +#pragma once #include "../BPy_UnaryFunction0DFloat.h" @@ -45,5 +44,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_READCOMPLETEVIEWMAPPIXELF0D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadMapPixelF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadMapPixelF0D.h index 014a4aa2b8e..54c9ac984f9 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadMapPixelF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadMapPixelF0D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_READMAPPIXELF0D_H__ -#define __FREESTYLE_PYTHON_READMAPPIXELF0D_H__ +#pragma once #include "../BPy_UnaryFunction0DFloat.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_READMAPPIXELF0D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadSteerableViewMapPixelF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadSteerableViewMapPixelF0D.h index 3cff99be633..f1fa1f1b7a2 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadSteerableViewMapPixelF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadSteerableViewMapPixelF0D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_READSTEERABLEVIEWMAPPIXELF0D_H__ -#define __FREESTYLE_PYTHON_READSTEERABLEVIEWMAPPIXELF0D_H__ +#pragma once #include "../BPy_UnaryFunction0DFloat.h" @@ -45,5 +44,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_READSTEERABLEVIEWMAPPIXELF0D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/BPy_QuantitativeInvisibilityF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/BPy_QuantitativeInvisibilityF0D.h index dd64fb40d85..510cc7ef146 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/BPy_QuantitativeInvisibilityF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/BPy_QuantitativeInvisibilityF0D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_QUANTITATIVEINVISIBILITYF0D_H__ -#define __FREESTYLE_PYTHON_QUANTITATIVEINVISIBILITYF0D_H__ +#pragma once #include "../BPy_UnaryFunction0DUnsigned.h" @@ -45,5 +44,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_QUANTITATIVEINVISIBILITYF0D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/BPy_GetOccludersF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/BPy_GetOccludersF0D.h index 82889b64aba..9e932ff9eff 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/BPy_GetOccludersF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/BPy_GetOccludersF0D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_GETOCCLUDERSF0D_H__ -#define __FREESTYLE_PYTHON_GETOCCLUDERSF0D_H__ +#pragma once #include "../BPy_UnaryFunction0DVectorViewShape.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_GETOCCLUDERSF0D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.h b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.h index cfd7f954b54..1fb42a18337 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_UNARYFUNCTION1DDOUBLE_H__ -#define __FREESTYLE_PYTHON_UNARYFUNCTION1DDOUBLE_H__ +#pragma once #include "../BPy_UnaryFunction1D.h" @@ -48,5 +47,3 @@ int UnaryFunction1DDouble_Init(PyObject *module); #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_UNARYFUNCTION1DDOUBLE_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.h b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.h index 1a7a5a2d7ee..886eb469d51 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_UNARYFUNCTION1DEDGENATURE_H__ -#define __FREESTYLE_PYTHON_UNARYFUNCTION1DEDGENATURE_H__ +#pragma once #include "../BPy_UnaryFunction1D.h" @@ -50,5 +49,3 @@ int UnaryFunction1DEdgeNature_Init(PyObject *module); #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_UNARYFUNCTION1DEDGENATURE_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.h b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.h index 8a5a329b0bf..8b977c9c96a 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_UNARYFUNCTION1DFLOAT_H__ -#define __FREESTYLE_PYTHON_UNARYFUNCTION1DFLOAT_H__ +#pragma once #include "../BPy_UnaryFunction1D.h" @@ -48,5 +47,3 @@ int UnaryFunction1DFloat_Init(PyObject *module); #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_UNARYFUNCTION1DFLOAT_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.h b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.h index b18bf34b27e..9149275b610 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_UNARYFUNCTION1DUNSIGNED_H__ -#define __FREESTYLE_PYTHON_UNARYFUNCTION1DUNSIGNED_H__ +#pragma once #include "../BPy_UnaryFunction1D.h" @@ -48,5 +47,3 @@ int UnaryFunction1DUnsigned_Init(PyObject *module); #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_UNARYFUNCTION1DUNSIGNED_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.h b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.h index f4cad92334f..b55f9af7c4d 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_UNARYFUNCTION1DVEC2F_H__ -#define __FREESTYLE_PYTHON_UNARYFUNCTION1DVEC2F_H__ +#pragma once #include "../BPy_UnaryFunction1D.h" @@ -51,5 +50,3 @@ int UnaryFunction1DVec2f_Init(PyObject *module); #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_UNARYFUNCTION1DVEC2F_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.h b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.h index 253a8d550e3..9e4342979e4 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_UNARYFUNCTION1DVEC3F_H__ -#define __FREESTYLE_PYTHON_UNARYFUNCTION1DVEC3F_H__ +#pragma once #include "../BPy_UnaryFunction1D.h" @@ -51,5 +50,3 @@ int UnaryFunction1DVec3f_Init(PyObject *module); #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_UNARYFUNCTION1DVEC3F_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.h b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.h index 80511e7c145..bfbcf5e451d 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_UNARYFUNCTION1DVECTORVIEWSHAPE_H__ -#define __FREESTYLE_PYTHON_UNARYFUNCTION1DVECTORVIEWSHAPE_H__ +#pragma once #include "../BPy_UnaryFunction1D.h" @@ -53,5 +52,3 @@ int UnaryFunction1DVectorViewShape_Init(PyObject *module); #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_UNARYFUNCTION1DVECTORVIEWSHAPE_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.h b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.h index 03d949f879d..3a821bc2083 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_UNARYFUNCTION1DVOID_H__ -#define __FREESTYLE_PYTHON_UNARYFUNCTION1DVOID_H__ +#pragma once #include "../BPy_UnaryFunction1D.h" @@ -48,5 +47,3 @@ int UnaryFunction1DVoid_Init(PyObject *module); #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_UNARYFUNCTION1DVOID_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.h index 15c381eb279..961c9729e6c 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_CURVENATUREF1D_H__ -#define __FREESTYLE_PYTHON_CURVENATUREF1D_H__ +#pragma once #include "../BPy_UnaryFunction1DEdgeNature.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_CURVENATUREF1D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Normal2DF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Normal2DF1D.h index 343c4379b4a..080f26aa753 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Normal2DF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Normal2DF1D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_NORMAL2DF1D_H__ -#define __FREESTYLE_PYTHON_NORMAL2DF1D_H__ +#pragma once #include "../BPy_UnaryFunction1DVec2f.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_NORMAL2DF1D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Orientation2DF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Orientation2DF1D.h index 5b453cbe714..013423003c6 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Orientation2DF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Orientation2DF1D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_ORIENTATION2DF1D_H__ -#define __FREESTYLE_PYTHON_ORIENTATION2DF1D_H__ +#pragma once #include "../BPy_UnaryFunction1DVec2f.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_ORIENTATION2DF1D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/BPy_Orientation3DF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/BPy_Orientation3DF1D.h index 26c6cd845db..2e79559bf43 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/BPy_Orientation3DF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/BPy_Orientation3DF1D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_ORIENTATION3DF1D_H__ -#define __FREESTYLE_PYTHON_ORIENTATION3DF1D_H__ +#pragma once #include "../BPy_UnaryFunction1DVec3f.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_ORIENTATION3DF1D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_Curvature2DAngleF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_Curvature2DAngleF1D.h index 7a3a3fcff4b..241c864fdad 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_Curvature2DAngleF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_Curvature2DAngleF1D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_CURVATURE2DANGLEF1D_H__ -#define __FREESTYLE_PYTHON_CURVATURE2DANGLEF1D_H__ +#pragma once #include "../BPy_UnaryFunction1DDouble.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_CURVATURE2DANGLEF1D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_DensityF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_DensityF1D.h index 71daa14069a..1b1040d66c4 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_DensityF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_DensityF1D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_DENSITYF1D_H__ -#define __FREESTYLE_PYTHON_DENSITYF1D_H__ +#pragma once #include "../BPy_UnaryFunction1DDouble.h" @@ -43,5 +42,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_DENSITYF1D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetCompleteViewMapDensityF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetCompleteViewMapDensityF1D.h index dacfb33553e..1bbb4d46fc5 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetCompleteViewMapDensityF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetCompleteViewMapDensityF1D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_GETCOMPLETEVIEWMAPDENSITYF1D_H__ -#define __FREESTYLE_PYTHON_GETCOMPLETEVIEWMAPDENSITYF1D_H__ +#pragma once #include "../BPy_UnaryFunction1DDouble.h" @@ -45,5 +44,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_GETCOMPLETEVIEWMAPDENSITYF1D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.h index b039fadcdca..8e55fc7cc50 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_GETDIRECTIONALVIEWMAPDENSITYF1D_H__ -#define __FREESTYLE_PYTHON_GETDIRECTIONALVIEWMAPDENSITYF1D_H__ +#pragma once #include "../BPy_UnaryFunction1DDouble.h" @@ -45,5 +44,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_GETDIRECTIONALVIEWMAPDENSITYF1D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedXF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedXF1D.h index febb3265f97..66bd3983e45 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedXF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedXF1D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_GETPROJECTEDXF1D_H__ -#define __FREESTYLE_PYTHON_GETPROJECTEDXF1D_H__ +#pragma once #include "../BPy_UnaryFunction1DDouble.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_GETPROJECTEDXF1D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedYF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedYF1D.h index 5a0a5f42cb0..b1a1e90f83f 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedYF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedYF1D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_GETPROJECTEDYF1D_H__ -#define __FREESTYLE_PYTHON_GETPROJECTEDYF1D_H__ +#pragma once #include "../BPy_UnaryFunction1DDouble.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_GETPROJECTEDYF1D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedZF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedZF1D.h index aeb42521d1f..73b01bbf999 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedZF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedZF1D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_GETPROJECTEDZF1D_H__ -#define __FREESTYLE_PYTHON_GETPROJECTEDZF1D_H__ +#pragma once #include "../BPy_UnaryFunction1DDouble.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_GETPROJECTEDZF1D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetSteerableViewMapDensityF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetSteerableViewMapDensityF1D.h index 47f168af2a8..81167d36352 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetSteerableViewMapDensityF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetSteerableViewMapDensityF1D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_GETSTEERABLEVIEWMAPDENSITYF1D_H__ -#define __FREESTYLE_PYTHON_GETSTEERABLEVIEWMAPDENSITYF1D_H__ +#pragma once #include "../BPy_UnaryFunction1DDouble.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_GETSTEERABLEVIEWMAPDENSITYF1D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetViewMapGradientNormF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetViewMapGradientNormF1D.h index 4f19b4ac67f..0e4a67cf4df 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetViewMapGradientNormF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetViewMapGradientNormF1D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_GETVIEWMAPGRADIENTNORMF1D_H__ -#define __FREESTYLE_PYTHON_GETVIEWMAPGRADIENTNORMF1D_H__ +#pragma once #include "../BPy_UnaryFunction1DDouble.h" @@ -45,5 +44,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_GETVIEWMAPGRADIENTNORMF1D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetXF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetXF1D.h index 7db31882381..30218ccd5e5 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetXF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetXF1D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_GETXF1D_H__ -#define __FREESTYLE_PYTHON_GETXF1D_H__ +#pragma once #include "../BPy_UnaryFunction1DDouble.h" @@ -43,5 +42,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_GETXF1D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetYF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetYF1D.h index 3f70d64e200..16afac368c1 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetYF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetYF1D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_GETYF1D_H__ -#define __FREESTYLE_PYTHON_GETYF1D_H__ +#pragma once #include "../BPy_UnaryFunction1DDouble.h" @@ -43,5 +42,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_GETYF1D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetZF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetZF1D.h index b841bde2a5c..a204f3d6665 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetZF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetZF1D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_GETZF1D_H__ -#define __FREESTYLE_PYTHON_GETZF1D_H__ +#pragma once #include "../BPy_UnaryFunction1DDouble.h" @@ -43,5 +42,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_GETZF1D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_LocalAverageDepthF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_LocalAverageDepthF1D.h index 258d028bfbd..d472489fb0c 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_LocalAverageDepthF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_LocalAverageDepthF1D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_LOCALAVERAGEDEPTHF1D_H__ -#define __FREESTYLE_PYTHON_LOCALAVERAGEDEPTHF1D_H__ +#pragma once #include "../BPy_UnaryFunction1DDouble.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_LOCALAVERAGEDEPTHF1D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.h index c336591842b..c1966472377 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_ZDISCONTINUITYF1D_H__ -#define __FREESTYLE_PYTHON_ZDISCONTINUITYF1D_H__ +#pragma once #include "../BPy_UnaryFunction1DDouble.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_ZDISCONTINUITYF1D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned_int/BPy_QuantitativeInvisibilityF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned_int/BPy_QuantitativeInvisibilityF1D.h index 0d4d118995b..c76e5f821f2 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned_int/BPy_QuantitativeInvisibilityF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned_int/BPy_QuantitativeInvisibilityF1D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_QUANTITATIVEINVISIBILITYF1D_H__ -#define __FREESTYLE_PYTHON_QUANTITATIVEINVISIBILITYF1D_H__ +#pragma once #include "../BPy_UnaryFunction1DUnsigned.h" @@ -45,5 +44,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_QUANTITATIVEINVISIBILITYF1D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludeeF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludeeF1D.h index 5a14b5dc35d..2e414446e47 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludeeF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludeeF1D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_GETOCCLUDEEF1D_H__ -#define __FREESTYLE_PYTHON_GETOCCLUDEEF1D_H__ +#pragma once #include "../BPy_UnaryFunction1DVectorViewShape.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_GETOCCLUDEEF1D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludersF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludersF1D.h index 29899d443a6..52c78bd7f4c 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludersF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludersF1D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_GETOCCLUDERSF1D_H__ -#define __FREESTYLE_PYTHON_GETOCCLUDERSF1D_H__ +#pragma once #include "../BPy_UnaryFunction1DVectorViewShape.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_GETOCCLUDERSF1D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetShapeF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetShapeF1D.h index b90f3df5831..9c025e3b404 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetShapeF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetShapeF1D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_GETSHAPEF1D_H__ -#define __FREESTYLE_PYTHON_GETSHAPEF1D_H__ +#pragma once #include "../BPy_UnaryFunction1DVectorViewShape.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_GETSHAPEF1D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_ChainingTimeStampF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_ChainingTimeStampF1D.h index c6423ef434f..0a8650d6794 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_ChainingTimeStampF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_ChainingTimeStampF1D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_CHAININGTIMESTAMPF1D_H__ -#define __FREESTYLE_PYTHON_CHAININGTIMESTAMPF1D_H__ +#pragma once #include "../BPy_UnaryFunction1DVoid.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_CHAININGTIMESTAMPF1D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.h index 0d74b1f7756..e555788f4c9 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_INCREMENTCHAININGTIMESTAMPF1D_H__ -#define __FREESTYLE_PYTHON_INCREMENTCHAININGTIMESTAMPF1D_H__ +#pragma once #include "../BPy_UnaryFunction1DVoid.h" @@ -45,5 +44,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_INCREMENTCHAININGTIMESTAMPF1D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_TimeStampF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_TimeStampF1D.h index 4787f35cfc5..117d724d179 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_TimeStampF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_TimeStampF1D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_TIMESTAMPF1D_H__ -#define __FREESTYLE_PYTHON_TIMESTAMPF1D_H__ +#pragma once #include "../BPy_UnaryFunction1DVoid.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_CHAININGTIMESTAMPF1D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_FalseUP0D.h b/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_FalseUP0D.h index b947ccf5b95..0c36e770b80 100644 --- a/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_FalseUP0D.h +++ b/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_FalseUP0D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_FALSEUP0D_H__ -#define __FREESTYLE_PYTHON_FALSEUP0D_H__ +#pragma once #include "../BPy_UnaryPredicate0D.h" @@ -43,5 +42,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_FALSEUP0D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_TrueUP0D.h b/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_TrueUP0D.h index 72acf363992..abdfb4e294d 100644 --- a/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_TrueUP0D.h +++ b/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_TrueUP0D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_TRUEUP0D_H__ -#define __FREESTYLE_PYTHON_TRUEUP0D_H__ +#pragma once #include "../BPy_UnaryPredicate0D.h" @@ -43,5 +42,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_TRUEUP0D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.h index de6c40fa8ac..be06a0fee33 100644 --- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.h +++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_CONTOURUP1D_H__ -#define __FREESTYLE_PYTHON_CONTOURUP1D_H__ +#pragma once #include "../BPy_UnaryPredicate1D.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_CONTOURUP1D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.h index fb02b63fa3d..068c7727ec0 100644 --- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.h +++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_DENSITYLOWERTHANUP1D_H__ -#define __FREESTYLE_PYTHON_DENSITYLOWERTHANUP1D_H__ +#pragma once #include "../BPy_UnaryPredicate1D.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_DENSITYLOWERTHANUP1D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.h index e2ba8b7709b..d103c1356ab 100644 --- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.h +++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_EQUALTOCHAININGTIMESTAMPUP1D_H__ -#define __FREESTYLE_PYTHON_EQUALTOCHAININGTIMESTAMPUP1D_H__ +#pragma once #include "../BPy_UnaryPredicate1D.h" @@ -45,5 +44,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_EQUALTOCHAININGTIMESTAMPUP1D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.h index 13736242382..9e3d90ab760 100644 --- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.h +++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_EQUALTOTIMESTAMPUP1D_H__ -#define __FREESTYLE_PYTHON_EQUALTOTIMESTAMPUP1D_H__ +#pragma once #include "../BPy_UnaryPredicate1D.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_EQUALTOTIMESTAMPUP1D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.h index 4d2a22731fa..0576b727f4a 100644 --- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.h +++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_EXTERNALCONTOURUP1D_H__ -#define __FREESTYLE_PYTHON_EXTERNALCONTOURUP1D_H__ +#pragma once #include "../BPy_UnaryPredicate1D.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_EXTERNALCONTOURUP1D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.h index 57255c2333f..a74d2aba0a6 100644 --- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.h +++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_FALSEUP1D_H__ -#define __FREESTYLE_PYTHON_FALSEUP1D_H__ +#pragma once #include "../BPy_UnaryPredicate1D.h" @@ -43,5 +42,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_FALSEUP1D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.h index bbb1dce5ed1..970ddd48273 100644 --- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.h +++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_QUANTITATIVEINVISIBILITYUP1D_H__ -#define __FREESTYLE_PYTHON_QUANTITATIVEINVISIBILITYUP1D_H__ +#pragma once #include "../BPy_UnaryPredicate1D.h" @@ -45,5 +44,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_QUANTITATIVEINVISIBILITYUP1D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.h index a48ed0aa0da..c60aa7aa9cf 100644 --- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.h +++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_SHAPEUP1D_H__ -#define __FREESTYLE_PYTHON_SHAPEUP1D_H__ +#pragma once #include "../BPy_UnaryPredicate1D.h" @@ -43,5 +42,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_SHAPEUP1D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.h index 49c3dcdacca..e036cfe95ed 100644 --- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.h +++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_TRUEUP1D_H__ -#define __FREESTYLE_PYTHON_TRUEUP1D_H__ +#pragma once #include "../BPy_UnaryPredicate1D.h" @@ -43,5 +42,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_TRUEUP1D_H__ */ diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_WithinImageBoundaryUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_WithinImageBoundaryUP1D.h index 2481beee78e..1d08f7fb530 100644 --- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_WithinImageBoundaryUP1D.h +++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_WithinImageBoundaryUP1D.h @@ -18,8 +18,7 @@ * \ingroup freestyle */ -#ifndef __FREESTYLE_PYTHON_WITHINIMAGEBOUNDARYUP1D_H__ -#define __FREESTYLE_PYTHON_WITHINIMAGEBOUNDARYUP1D_H__ +#pragma once #include "../BPy_UnaryPredicate1D.h" @@ -44,5 +43,3 @@ typedef struct { #ifdef __cplusplus } #endif - -#endif /* __FREESTYLE_PYTHON_WITHINIMAGEBOUNDARYUP1D_H__ */ |