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:
Diffstat (limited to 'source/blender/freestyle/intern/python/Interface1D/FEdge')
-rw-r--r--source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp21
-rw-r--r--source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp15
2 files changed, 24 insertions, 12 deletions
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 e91ae155929..018d0c77bb0 100644
--- a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp
@@ -68,10 +68,12 @@ static int FEdgeSharp_init(BPy_FEdgeSharp *self, PyObject *args, PyObject *kwds)
PyObject *obj1 = 0, *obj2 = 0;
if (PyArg_ParseTupleAndKeywords(args, kwds, "|O!", (char **)kwlist_1, &FEdgeSharp_Type, &obj1)) {
- if (!obj1)
+ if (!obj1) {
self->fes = new FEdgeSharp();
- else
+ }
+ else {
self->fes = new FEdgeSharp(*(((BPy_FEdgeSharp *)obj1)->fes));
+ }
}
else if (PyErr_Clear(),
PyArg_ParseTupleAndKeywords(args,
@@ -102,8 +104,9 @@ static int FEdgeSharp_init(BPy_FEdgeSharp *self, PyObject *args, PyObject *kwds)
static int FEdgeSharp_mathutils_check(BaseMathObject *bmo)
{
- if (!BPy_FEdgeSharp_Check(bmo->cb_user))
+ if (!BPy_FEdgeSharp_Check(bmo->cb_user)) {
return -1;
+ }
return 0;
}
@@ -266,8 +269,9 @@ static int FEdgeSharp_material_index_right_set(BPy_FEdgeSharp *self,
void *UNUSED(closure))
{
unsigned int i = PyLong_AsUnsignedLong(value);
- if (PyErr_Occurred())
+ if (PyErr_Occurred()) {
return -1;
+ }
self->fes->setaFrsMaterialIndex(i);
return 0;
}
@@ -287,8 +291,9 @@ static int FEdgeSharp_material_index_left_set(BPy_FEdgeSharp *self,
void *UNUSED(closure))
{
unsigned int i = PyLong_AsUnsignedLong(value);
- if (PyErr_Occurred())
+ if (PyErr_Occurred()) {
return -1;
+ }
self->fes->setbFrsMaterialIndex(i);
return 0;
}
@@ -330,8 +335,9 @@ static int FEdgeSharp_face_mark_right_set(BPy_FEdgeSharp *self,
PyObject *value,
void *UNUSED(closure))
{
- if (!PyBool_Check(value))
+ if (!PyBool_Check(value)) {
return -1;
+ }
self->fes->setaFaceMark(bool_from_PyBool(value));
return 0;
}
@@ -350,8 +356,9 @@ static int FEdgeSharp_face_mark_left_set(BPy_FEdgeSharp *self,
PyObject *value,
void *UNUSED(closure))
{
- if (!PyBool_Check(value))
+ if (!PyBool_Check(value)) {
return -1;
+ }
self->fes->setbFaceMark(bool_from_PyBool(value));
return 0;
}
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 08d18123172..4c2785509f0 100644
--- a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp
@@ -66,10 +66,12 @@ static int FEdgeSmooth_init(BPy_FEdgeSmooth *self, PyObject *args, PyObject *kwd
if (PyArg_ParseTupleAndKeywords(
args, kwds, "|O!", (char **)kwlist_1, &FEdgeSmooth_Type, &obj1)) {
- if (!obj1)
+ if (!obj1) {
self->fes = new FEdgeSmooth();
- else
+ }
+ else {
self->fes = new FEdgeSmooth(*(((BPy_FEdgeSmooth *)obj1)->fes));
+ }
}
else if (PyErr_Clear(),
PyArg_ParseTupleAndKeywords(args,
@@ -96,8 +98,9 @@ static int FEdgeSmooth_init(BPy_FEdgeSmooth *self, PyObject *args, PyObject *kwd
static int FEdgeSmooth_mathutils_check(BaseMathObject *bmo)
{
- if (!BPy_FEdgeSmooth_Check(bmo->cb_user))
+ if (!BPy_FEdgeSmooth_Check(bmo->cb_user)) {
return -1;
+ }
return 0;
}
@@ -189,8 +192,9 @@ static int FEdgeSmooth_material_index_set(BPy_FEdgeSmooth *self,
void *UNUSED(closure))
{
unsigned int i = PyLong_AsUnsignedLong(value);
- if (PyErr_Occurred())
+ if (PyErr_Occurred()) {
return -1;
+ }
self->fes->setFrsMaterialIndex(i);
return 0;
}
@@ -217,8 +221,9 @@ static PyObject *FEdgeSmooth_face_mark_get(BPy_FEdgeSmooth *self, void *UNUSED(c
static int FEdgeSmooth_face_mark_set(BPy_FEdgeSmooth *self, PyObject *value, void *UNUSED(closure))
{
- if (!PyBool_Check(value))
+ if (!PyBool_Check(value)) {
return -1;
+ }
self->fes->setFaceMark(bool_from_PyBool(value));
return 0;
}