diff options
Diffstat (limited to 'source/blender/freestyle/intern/python/Director.cpp')
-rw-r--r-- | source/blender/freestyle/intern/python/Director.cpp | 69 |
1 files changed, 46 insertions, 23 deletions
diff --git a/source/blender/freestyle/intern/python/Director.cpp b/source/blender/freestyle/intern/python/Director.cpp index c86602c78b1..c931a246961 100644 --- a/source/blender/freestyle/intern/python/Director.cpp +++ b/source/blender/freestyle/intern/python/Director.cpp @@ -75,12 +75,14 @@ int Director_BPy_BinaryPredicate0D___call__(BinaryPredicate0D *bp0D, PyObject *result = PyObject_CallMethod((PyObject *)bp0D->py_bp0D, "__call__", "OO", arg1, arg2); Py_DECREF(arg1); Py_DECREF(arg2); - if (!result) + if (!result) { return -1; + } int ret = PyObject_IsTrue(result); Py_DECREF(result); - if (ret < 0) + if (ret < 0) { return -1; + } bp0D->result = ret; return 0; } @@ -104,12 +106,14 @@ int Director_BPy_BinaryPredicate1D___call__(BinaryPredicate1D *bp1D, PyObject *result = PyObject_CallMethod((PyObject *)bp1D->py_bp1D, "__call__", "OO", arg1, arg2); Py_DECREF(arg1); Py_DECREF(arg2); - if (!result) + if (!result) { return -1; + } int ret = PyObject_IsTrue(result); Py_DECREF(result); - if (ret < 0) + if (ret < 0) { return -1; + } bp1D->result = ret; return 0; } @@ -122,16 +126,19 @@ int Director_BPy_UnaryPredicate0D___call__(UnaryPredicate0D *up0D, Interface0DIt return -1; } PyObject *arg = BPy_Interface0DIterator_from_Interface0DIterator(if0D_it, false); - if (!arg) + if (!arg) { return -1; + } PyObject *result = PyObject_CallMethod((PyObject *)up0D->py_up0D, "__call__", "O", arg); Py_DECREF(arg); - if (!result) + if (!result) { return -1; + } int ret = PyObject_IsTrue(result); Py_DECREF(result); - if (ret < 0) + if (ret < 0) { return -1; + } up0D->result = ret; return 0; } @@ -144,16 +151,19 @@ int Director_BPy_UnaryPredicate1D___call__(UnaryPredicate1D *up1D, Interface1D & return -1; } PyObject *arg = Any_BPy_Interface1D_from_Interface1D(if1D); - if (!arg) + if (!arg) { return -1; + } PyObject *result = PyObject_CallMethod((PyObject *)up1D->py_up1D, "__call__", "O", arg); Py_DECREF(arg); - if (!result) + if (!result) { return -1; + } int ret = PyObject_IsTrue(result); Py_DECREF(result); - if (ret < 0) + if (ret < 0) { return -1; + } up1D->result = ret; return 0; } @@ -166,12 +176,14 @@ int Director_BPy_StrokeShader_shade(StrokeShader *ss, Stroke &s) return -1; } PyObject *arg = BPy_Stroke_from_Stroke(s); - if (!arg) + if (!arg) { return -1; + } PyObject *result = PyObject_CallMethod((PyObject *)ss->py_ss, "shade", "O", arg); Py_DECREF(arg); - if (!result) + if (!result) { return -1; + } Py_DECREF(result); return 0; } @@ -184,8 +196,9 @@ int Director_BPy_ChainingIterator_init(ChainingIterator *c_it) return -1; } PyObject *result = PyObject_CallMethod((PyObject *)c_it->py_c_it, "init", NULL); - if (!result) + if (!result) { return -1; + } Py_DECREF(result); return 0; } @@ -197,12 +210,14 @@ int Director_BPy_ChainingIterator_traverse(ChainingIterator *c_it, AdjacencyIter return -1; } PyObject *arg = BPy_AdjacencyIterator_from_AdjacencyIterator(a_it); - if (!arg) + if (!arg) { return -1; + } PyObject *result = PyObject_CallMethod((PyObject *)c_it->py_c_it, "traverse", "O", arg); Py_DECREF(arg); - if (!result) + if (!result) { return -1; + } if (BPy_ViewEdge_Check(result)) { c_it->result = ((BPy_ViewEdge *)result)->ve; } @@ -227,12 +242,14 @@ int Director_BPy_UnaryFunction0D___call__(void *uf0D, void *py_uf0D, Interface0D } PyObject *obj = (PyObject *)py_uf0D; PyObject *arg = BPy_Interface0DIterator_from_Interface0DIterator(if0D_it, false); - if (!arg) + if (!arg) { return -1; + } PyObject *result = PyObject_CallMethod(obj, "__call__", "O", arg); Py_DECREF(arg); - if (!result) + if (!result) { return -1; + } if (BPy_UnaryFunction0DDouble_Check(obj)) { ((UnaryFunction0D<double> *)uf0D)->result = PyFloat_AsDouble(result); } @@ -253,14 +270,16 @@ int Director_BPy_UnaryFunction0D___call__(void *uf0D, void *py_uf0D, Interface0D } else if (BPy_UnaryFunction0DVec2f_Check(obj)) { Vec2f vec; - if (!Vec2f_ptr_from_Vector(result, vec)) + if (!Vec2f_ptr_from_Vector(result, vec)) { return -1; + } ((UnaryFunction0D<Vec2f> *)uf0D)->result = vec; } else if (BPy_UnaryFunction0DVec3f_Check(obj)) { Vec3f vec; - if (!Vec3f_ptr_from_Vector(result, vec)) + if (!Vec3f_ptr_from_Vector(result, vec)) { return -1; + } ((UnaryFunction0D<Vec3f> *)uf0D)->result = vec; } else if (BPy_UnaryFunction0DVectorViewShape_Check(obj)) { @@ -287,12 +306,14 @@ int Director_BPy_UnaryFunction1D___call__(void *uf1D, void *py_uf1D, Interface1D } PyObject *obj = (PyObject *)py_uf1D; PyObject *arg = Any_BPy_Interface1D_from_Interface1D(if1D); - if (!arg) + if (!arg) { return -1; + } PyObject *result = PyObject_CallMethod(obj, "__call__", "O", arg); Py_DECREF(arg); - if (!result) + if (!result) { return -1; + } if (BPy_UnaryFunction1DDouble_Check(obj)) { ((UnaryFunction1D<double> *)uf1D)->result = PyFloat_AsDouble(result); } @@ -307,14 +328,16 @@ int Director_BPy_UnaryFunction1D___call__(void *uf1D, void *py_uf1D, Interface1D } else if (BPy_UnaryFunction1DVec2f_Check(obj)) { Vec2f vec; - if (!Vec2f_ptr_from_Vector(result, vec)) + if (!Vec2f_ptr_from_Vector(result, vec)) { return -1; + } ((UnaryFunction1D<Vec2f> *)uf1D)->result = vec; } else if (BPy_UnaryFunction1DVec3f_Check(obj)) { Vec3f vec; - if (!Vec3f_ptr_from_Vector(result, vec)) + if (!Vec3f_ptr_from_Vector(result, vec)) { return -1; + } ((UnaryFunction1D<Vec3f> *)uf1D)->result = vec; } else if (BPy_UnaryFunction1DVectorViewShape_Check(obj)) { |