Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-05-31 15:51:19 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-05-31 15:55:15 +0300
commitd8dbd49a2f23b7637f05fc058f39bdf6ab706624 (patch)
tree0805b9372c82ae6505d87e879824efe1d3e32f8e /source/blender/freestyle/intern/python/BPy_Interface0D.cpp
parent8987f7987d8160e1f6e79e8c85d6ce65b885ab25 (diff)
Cleanup: style, use braces in source/
Automated using clang-tidy.
Diffstat (limited to 'source/blender/freestyle/intern/python/BPy_Interface0D.cpp')
-rw-r--r--source/blender/freestyle/intern/python/BPy_Interface0D.cpp61
1 files changed, 41 insertions, 20 deletions
diff --git a/source/blender/freestyle/intern/python/BPy_Interface0D.cpp b/source/blender/freestyle/intern/python/BPy_Interface0D.cpp
index 897f2f06c28..40e5267460b 100644
--- a/source/blender/freestyle/intern/python/BPy_Interface0D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Interface0D.cpp
@@ -39,41 +39,49 @@ extern "C" {
//-------------------MODULE INITIALIZATION--------------------------------
int Interface0D_Init(PyObject *module)
{
- if (module == NULL)
+ if (module == NULL) {
return -1;
+ }
- if (PyType_Ready(&Interface0D_Type) < 0)
+ if (PyType_Ready(&Interface0D_Type) < 0) {
return -1;
+ }
Py_INCREF(&Interface0D_Type);
PyModule_AddObject(module, "Interface0D", (PyObject *)&Interface0D_Type);
- if (PyType_Ready(&CurvePoint_Type) < 0)
+ if (PyType_Ready(&CurvePoint_Type) < 0) {
return -1;
+ }
Py_INCREF(&CurvePoint_Type);
PyModule_AddObject(module, "CurvePoint", (PyObject *)&CurvePoint_Type);
- if (PyType_Ready(&SVertex_Type) < 0)
+ if (PyType_Ready(&SVertex_Type) < 0) {
return -1;
+ }
Py_INCREF(&SVertex_Type);
PyModule_AddObject(module, "SVertex", (PyObject *)&SVertex_Type);
- if (PyType_Ready(&ViewVertex_Type) < 0)
+ if (PyType_Ready(&ViewVertex_Type) < 0) {
return -1;
+ }
Py_INCREF(&ViewVertex_Type);
PyModule_AddObject(module, "ViewVertex", (PyObject *)&ViewVertex_Type);
- if (PyType_Ready(&StrokeVertex_Type) < 0)
+ if (PyType_Ready(&StrokeVertex_Type) < 0) {
return -1;
+ }
Py_INCREF(&StrokeVertex_Type);
PyModule_AddObject(module, "StrokeVertex", (PyObject *)&StrokeVertex_Type);
- if (PyType_Ready(&NonTVertex_Type) < 0)
+ if (PyType_Ready(&NonTVertex_Type) < 0) {
return -1;
+ }
Py_INCREF(&NonTVertex_Type);
PyModule_AddObject(module, "NonTVertex", (PyObject *)&NonTVertex_Type);
- if (PyType_Ready(&TVertex_Type) < 0)
+ if (PyType_Ready(&TVertex_Type) < 0) {
return -1;
+ }
Py_INCREF(&TVertex_Type);
PyModule_AddObject(module, "TVertex", (PyObject *)&TVertex_Type);
@@ -96,8 +104,9 @@ static int Interface0D_init(BPy_Interface0D *self, PyObject *args, PyObject *kwd
{
static const char *kwlist[] = {NULL};
- if (!PyArg_ParseTupleAndKeywords(args, kwds, "", (char **)kwlist))
+ if (!PyArg_ParseTupleAndKeywords(args, kwds, "", (char **)kwlist)) {
return -1;
+ }
self->if0D = new Interface0D();
self->borrowed = false;
return 0;
@@ -105,8 +114,9 @@ static int Interface0D_init(BPy_Interface0D *self, PyObject *args, PyObject *kwd
static void Interface0D_dealloc(BPy_Interface0D *self)
{
- if (self->if0D && !self->borrowed)
+ if (self->if0D && !self->borrowed) {
delete self->if0D;
+ }
Py_TYPE(self)->tp_free((PyObject *)self);
}
@@ -132,13 +142,17 @@ static PyObject *Interface0D_get_fedge(BPy_Interface0D *self, PyObject *args, Py
static const char *kwlist[] = {"inter", NULL};
PyObject *py_if0D;
- if (!PyArg_ParseTupleAndKeywords(args, kwds, "O!", (char **)kwlist, &Interface0D_Type, &py_if0D))
+ if (!PyArg_ParseTupleAndKeywords(
+ args, kwds, "O!", (char **)kwlist, &Interface0D_Type, &py_if0D)) {
return NULL;
+ }
FEdge *fe = self->if0D->getFEdge(*(((BPy_Interface0D *)py_if0D)->if0D));
- if (PyErr_Occurred())
+ if (PyErr_Occurred()) {
return NULL;
- if (fe)
+ }
+ if (fe) {
return Any_BPy_FEdge_from_FEdge(*fe);
+ }
Py_RETURN_NONE;
}
@@ -170,8 +184,9 @@ PyDoc_STRVAR(Interface0D_point_3d_doc,
static PyObject *Interface0D_point_3d_get(BPy_Interface0D *self, void *UNUSED(closure))
{
Vec3f p(self->if0D->getPoint3D());
- if (PyErr_Occurred())
+ if (PyErr_Occurred()) {
return NULL;
+ }
return Vector_from_Vec3f(p);
}
@@ -183,8 +198,9 @@ PyDoc_STRVAR(Interface0D_projected_x_doc,
static PyObject *Interface0D_projected_x_get(BPy_Interface0D *self, void *UNUSED(closure))
{
real x = self->if0D->getProjectedX();
- if (PyErr_Occurred())
+ if (PyErr_Occurred()) {
return NULL;
+ }
return PyFloat_FromDouble(x);
}
@@ -196,8 +212,9 @@ PyDoc_STRVAR(Interface0D_projected_y_doc,
static PyObject *Interface0D_projected_y_get(BPy_Interface0D *self, void *UNUSED(closure))
{
real y = self->if0D->getProjectedY();
- if (PyErr_Occurred())
+ if (PyErr_Occurred()) {
return NULL;
+ }
return PyFloat_FromDouble(y);
}
@@ -209,8 +226,9 @@ PyDoc_STRVAR(Interface0D_projected_z_doc,
static PyObject *Interface0D_projected_z_get(BPy_Interface0D *self, void *UNUSED(closure))
{
real z = self->if0D->getProjectedZ();
- if (PyErr_Occurred())
+ if (PyErr_Occurred()) {
return NULL;
+ }
return PyFloat_FromDouble(z);
}
@@ -222,8 +240,9 @@ PyDoc_STRVAR(Interface0D_point_2d_doc,
static PyObject *Interface0D_point_2d_get(BPy_Interface0D *self, void *UNUSED(closure))
{
Vec2f p(self->if0D->getPoint2D());
- if (PyErr_Occurred())
+ if (PyErr_Occurred()) {
return NULL;
+ }
return Vector_from_Vec2f(p);
}
@@ -235,8 +254,9 @@ PyDoc_STRVAR(Interface0D_id_doc,
static PyObject *Interface0D_id_get(BPy_Interface0D *self, void *UNUSED(closure))
{
Id id(self->if0D->getId());
- if (PyErr_Occurred())
+ if (PyErr_Occurred()) {
return NULL;
+ }
return BPy_Id_from_Id(id); // return a copy
}
@@ -248,8 +268,9 @@ PyDoc_STRVAR(Interface0D_nature_doc,
static PyObject *Interface0D_nature_get(BPy_Interface0D *self, void *UNUSED(closure))
{
Nature::VertexNature nature = self->if0D->getNature();
- if (PyErr_Occurred())
+ if (PyErr_Occurred()) {
return NULL;
+ }
return BPy_Nature_from_Nature(nature);
}