diff options
Diffstat (limited to 'source/blender/freestyle/intern/python/BPy_Operators.cpp')
-rw-r--r-- | source/blender/freestyle/intern/python/BPy_Operators.cpp | 188 |
1 files changed, 94 insertions, 94 deletions
diff --git a/source/blender/freestyle/intern/python/BPy_Operators.cpp b/source/blender/freestyle/intern/python/BPy_Operators.cpp index 1235786d5d3..814f4b20831 100644 --- a/source/blender/freestyle/intern/python/BPy_Operators.cpp +++ b/source/blender/freestyle/intern/python/BPy_Operators.cpp @@ -41,7 +41,7 @@ extern "C" { //-------------------MODULE INITIALIZATION-------------------------------- int Operators_Init(PyObject *module) { - if (module == NULL) { + if (module == nullptr) { return -1; } @@ -78,23 +78,23 @@ PyDoc_STRVAR(Operators_select_doc, static PyObject *Operators_select(BPy_Operators * /*self*/, PyObject *args, PyObject *kwds) { - static const char *kwlist[] = {"pred", NULL}; - PyObject *obj = 0; + static const char *kwlist[] = {"pred", nullptr}; + PyObject *obj = nullptr; if (!PyArg_ParseTupleAndKeywords( args, kwds, "O!", (char **)kwlist, &UnaryPredicate1D_Type, &obj)) { - return NULL; + return nullptr; } if (!((BPy_UnaryPredicate1D *)obj)->up1D) { PyErr_SetString(PyExc_TypeError, "Operators.select(): 1st argument: invalid UnaryPredicate1D object"); - return NULL; + return nullptr; } if (Operators::select(*(((BPy_UnaryPredicate1D *)obj)->up1D)) < 0) { if (!PyErr_Occurred()) { PyErr_SetString(PyExc_RuntimeError, "Operators.select() failed"); } - return NULL; + return nullptr; } Py_RETURN_NONE; } @@ -123,8 +123,8 @@ PyDoc_STRVAR(Operators_chain_doc, static PyObject *Operators_chain(BPy_Operators * /*self*/, PyObject *args, PyObject *kwds) { - static const char *kwlist[] = {"it", "pred", "modifier", NULL}; - PyObject *obj1 = 0, *obj2 = 0, *obj3 = 0; + static const char *kwlist[] = {"it", "pred", "modifier", nullptr}; + PyObject *obj1 = nullptr, *obj2 = nullptr, *obj3 = nullptr; if (!PyArg_ParseTupleAndKeywords(args, kwds, @@ -136,17 +136,17 @@ static PyObject *Operators_chain(BPy_Operators * /*self*/, PyObject *args, PyObj &obj2, &UnaryFunction1DVoid_Type, &obj3)) { - return NULL; + return nullptr; } if (!((BPy_ChainingIterator *)obj1)->c_it) { PyErr_SetString(PyExc_TypeError, "Operators.chain(): 1st argument: invalid ChainingIterator object"); - return NULL; + return nullptr; } if (!((BPy_UnaryPredicate1D *)obj2)->up1D) { PyErr_SetString(PyExc_TypeError, "Operators.chain(): 2nd argument: invalid UnaryPredicate1D object"); - return NULL; + return nullptr; } if (!obj3) { if (Operators::chain(*(((BPy_ChainingIterator *)obj1)->c_it), @@ -154,14 +154,14 @@ static PyObject *Operators_chain(BPy_Operators * /*self*/, PyObject *args, PyObj if (!PyErr_Occurred()) { PyErr_SetString(PyExc_RuntimeError, "Operators.chain() failed"); } - return NULL; + return nullptr; } } else { if (!((BPy_UnaryFunction1DVoid *)obj3)->uf1D_void) { PyErr_SetString(PyExc_TypeError, "Operators.chain(): 3rd argument: invalid UnaryFunction1DVoid object"); - return NULL; + return nullptr; } if (Operators::chain(*(((BPy_ChainingIterator *)obj1)->c_it), *(((BPy_UnaryPredicate1D *)obj2)->up1D), @@ -169,7 +169,7 @@ static PyObject *Operators_chain(BPy_Operators * /*self*/, PyObject *args, PyObj if (!PyErr_Occurred()) { PyErr_SetString(PyExc_RuntimeError, "Operators.chain() failed"); } - return NULL; + return nullptr; } } Py_RETURN_NONE; @@ -203,8 +203,8 @@ static PyObject *Operators_bidirectional_chain(BPy_Operators * /*self*/, PyObject *args, PyObject *kwds) { - static const char *kwlist[] = {"it", "pred", NULL}; - PyObject *obj1 = 0, *obj2 = 0; + static const char *kwlist[] = {"it", "pred", nullptr}; + PyObject *obj1 = nullptr, *obj2 = nullptr; if (!PyArg_ParseTupleAndKeywords(args, kwds, @@ -214,20 +214,20 @@ static PyObject *Operators_bidirectional_chain(BPy_Operators * /*self*/, &obj1, &UnaryPredicate1D_Type, &obj2)) { - return NULL; + return nullptr; } if (!((BPy_ChainingIterator *)obj1)->c_it) { PyErr_SetString( PyExc_TypeError, "Operators.bidirectional_chain(): 1st argument: invalid ChainingIterator object"); - return NULL; + return nullptr; } if (!obj2) { if (Operators::bidirectionalChain(*(((BPy_ChainingIterator *)obj1)->c_it)) < 0) { if (!PyErr_Occurred()) { PyErr_SetString(PyExc_RuntimeError, "Operators.bidirectional_chain() failed"); } - return NULL; + return nullptr; } } else { @@ -235,14 +235,14 @@ static PyObject *Operators_bidirectional_chain(BPy_Operators * /*self*/, PyErr_SetString( PyExc_TypeError, "Operators.bidirectional_chain(): 2nd argument: invalid UnaryPredicate1D object"); - return NULL; + return nullptr; } if (Operators::bidirectionalChain(*(((BPy_ChainingIterator *)obj1)->c_it), *(((BPy_UnaryPredicate1D *)obj2)->up1D)) < 0) { if (!PyErr_Occurred()) { PyErr_SetString(PyExc_RuntimeError, "Operators.bidirectional_chain() failed"); } - return NULL; + return nullptr; } } Py_RETURN_NONE; @@ -283,9 +283,9 @@ static PyObject *Operators_sequential_split(BPy_Operators * /*self*/, PyObject *args, PyObject *kwds) { - static const char *kwlist_1[] = {"starting_pred", "stopping_pred", "sampling", NULL}; - static const char *kwlist_2[] = {"pred", "sampling", NULL}; - PyObject *obj1 = 0, *obj2 = 0; + static const char *kwlist_1[] = {"starting_pred", "stopping_pred", "sampling", nullptr}; + static const char *kwlist_2[] = {"pred", "sampling", nullptr}; + PyObject *obj1 = nullptr, *obj2 = nullptr; float f = 0.0f; if (PyArg_ParseTupleAndKeywords(args, @@ -301,13 +301,13 @@ static PyObject *Operators_sequential_split(BPy_Operators * /*self*/, PyErr_SetString( PyExc_TypeError, "Operators.sequential_split(): 1st argument: invalid UnaryPredicate0D object"); - return NULL; + return nullptr; } if (!((BPy_UnaryPredicate0D *)obj2)->up0D) { PyErr_SetString( PyExc_TypeError, "Operators.sequential_split(): 2nd argument: invalid UnaryPredicate0D object"); - return NULL; + return nullptr; } if (Operators::sequentialSplit(*(((BPy_UnaryPredicate0D *)obj1)->up0D), *(((BPy_UnaryPredicate0D *)obj2)->up0D), @@ -315,7 +315,7 @@ static PyObject *Operators_sequential_split(BPy_Operators * /*self*/, if (!PyErr_Occurred()) { PyErr_SetString(PyExc_RuntimeError, "Operators.sequential_split() failed"); } - return NULL; + return nullptr; } } else if ((void)PyErr_Clear(), @@ -326,18 +326,18 @@ static PyObject *Operators_sequential_split(BPy_Operators * /*self*/, PyErr_SetString( PyExc_TypeError, "Operators.sequential_split(): 1st argument: invalid UnaryPredicate0D object"); - return NULL; + return nullptr; } if (Operators::sequentialSplit(*(((BPy_UnaryPredicate0D *)obj1)->up0D), f) < 0) { if (!PyErr_Occurred()) { PyErr_SetString(PyExc_RuntimeError, "Operators.sequential_split() failed"); } - return NULL; + return nullptr; } } else { PyErr_SetString(PyExc_TypeError, "invalid argument(s)"); - return NULL; + return nullptr; } Py_RETURN_NONE; } @@ -382,9 +382,9 @@ static PyObject *Operators_recursive_split(BPy_Operators * /*self*/, PyObject *args, PyObject *kwds) { - static const char *kwlist_1[] = {"func", "pred_1d", "sampling", NULL}; - static const char *kwlist_2[] = {"func", "pred_0d", "pred_1d", "sampling", NULL}; - PyObject *obj1 = 0, *obj2 = 0, *obj3 = 0; + static const char *kwlist_1[] = {"func", "pred_1d", "sampling", nullptr}; + static const char *kwlist_2[] = {"func", "pred_0d", "pred_1d", "sampling", nullptr}; + PyObject *obj1 = nullptr, *obj2 = nullptr, *obj3 = nullptr; float f = 0.0f; if (PyArg_ParseTupleAndKeywords(args, @@ -400,13 +400,13 @@ static PyObject *Operators_recursive_split(BPy_Operators * /*self*/, PyErr_SetString( PyExc_TypeError, "Operators.recursive_split(): 1st argument: invalid UnaryFunction0DDouble object"); - return NULL; + return nullptr; } if (!((BPy_UnaryPredicate1D *)obj2)->up1D) { PyErr_SetString( PyExc_TypeError, "Operators.recursive_split(): 2nd argument: invalid UnaryPredicate1D object"); - return NULL; + return nullptr; } if (Operators::recursiveSplit(*(((BPy_UnaryFunction0DDouble *)obj1)->uf0D_double), *(((BPy_UnaryPredicate1D *)obj2)->up1D), @@ -414,7 +414,7 @@ static PyObject *Operators_recursive_split(BPy_Operators * /*self*/, if (!PyErr_Occurred()) { PyErr_SetString(PyExc_RuntimeError, "Operators.recursive_split() failed"); } - return NULL; + return nullptr; } } else if ((void)PyErr_Clear(), @@ -434,19 +434,19 @@ static PyObject *Operators_recursive_split(BPy_Operators * /*self*/, PyErr_SetString( PyExc_TypeError, "Operators.recursive_split(): 1st argument: invalid UnaryFunction0DDouble object"); - return NULL; + return nullptr; } if (!((BPy_UnaryPredicate0D *)obj2)->up0D) { PyErr_SetString( PyExc_TypeError, "Operators.recursive_split(): 2nd argument: invalid UnaryPredicate0D object"); - return NULL; + return nullptr; } if (!((BPy_UnaryPredicate1D *)obj3)->up1D) { PyErr_SetString( PyExc_TypeError, "Operators.recursive_split(): 3rd argument: invalid UnaryPredicate1D object"); - return NULL; + return nullptr; } if (Operators::recursiveSplit(*(((BPy_UnaryFunction0DDouble *)obj1)->uf0D_double), *(((BPy_UnaryPredicate0D *)obj2)->up0D), @@ -455,12 +455,12 @@ static PyObject *Operators_recursive_split(BPy_Operators * /*self*/, if (!PyErr_Occurred()) { PyErr_SetString(PyExc_RuntimeError, "Operators.recursive_split() failed"); } - return NULL; + return nullptr; } } else { PyErr_SetString(PyExc_TypeError, "invalid argument(s)"); - return NULL; + return nullptr; } Py_RETURN_NONE; } @@ -476,23 +476,23 @@ PyDoc_STRVAR(Operators_sort_doc, static PyObject *Operators_sort(BPy_Operators * /*self*/, PyObject *args, PyObject *kwds) { - static const char *kwlist[] = {"pred", NULL}; - PyObject *obj = 0; + static const char *kwlist[] = {"pred", nullptr}; + PyObject *obj = nullptr; if (!PyArg_ParseTupleAndKeywords( args, kwds, "O!", (char **)kwlist, &BinaryPredicate1D_Type, &obj)) { - return NULL; + return nullptr; } if (!((BPy_BinaryPredicate1D *)obj)->bp1D) { PyErr_SetString(PyExc_TypeError, "Operators.sort(): 1st argument: invalid BinaryPredicate1D object"); - return NULL; + return nullptr; } if (Operators::sort(*(((BPy_BinaryPredicate1D *)obj)->bp1D)) < 0) { if (!PyErr_Occurred()) { PyErr_SetString(PyExc_RuntimeError, "Operators.sort() failed"); } - return NULL; + return nullptr; } Py_RETURN_NONE; } @@ -511,8 +511,8 @@ PyDoc_STRVAR(Operators_create_doc, static PyObject *Operators_create(BPy_Operators * /*self*/, PyObject *args, PyObject *kwds) { - static const char *kwlist[] = {"pred", "shaders", NULL}; - PyObject *obj1 = 0, *obj2 = 0; + static const char *kwlist[] = {"pred", "shaders", nullptr}; + PyObject *obj1 = nullptr, *obj2 = nullptr; if (!PyArg_ParseTupleAndKeywords(args, kwds, @@ -522,12 +522,12 @@ static PyObject *Operators_create(BPy_Operators * /*self*/, PyObject *args, PyOb &obj1, &PyList_Type, &obj2)) { - return NULL; + return nullptr; } if (!((BPy_UnaryPredicate1D *)obj1)->up1D) { PyErr_SetString(PyExc_TypeError, "Operators.create(): 1st argument: invalid UnaryPredicate1D object"); - return NULL; + return nullptr; } vector<StrokeShader *> shaders; shaders.reserve(PyList_Size(obj2)); @@ -536,7 +536,7 @@ static PyObject *Operators_create(BPy_Operators * /*self*/, PyObject *args, PyOb if (!BPy_StrokeShader_Check(py_ss)) { PyErr_SetString(PyExc_TypeError, "Operators.create(): 2nd argument must be a list of StrokeShader objects"); - return NULL; + return nullptr; } StrokeShader *shader = ((BPy_StrokeShader *)py_ss)->ss; if (!shader) { @@ -545,7 +545,7 @@ static PyObject *Operators_create(BPy_Operators * /*self*/, PyObject *args, PyOb << " of the shaders list is invalid likely due to missing call of " "StrokeShader.__init__()"; PyErr_SetString(PyExc_TypeError, ss.str().c_str()); - return NULL; + return nullptr; } shaders.push_back(shader); } @@ -553,7 +553,7 @@ static PyObject *Operators_create(BPy_Operators * /*self*/, PyObject *args, PyOb if (!PyErr_Occurred()) { PyErr_SetString(PyExc_RuntimeError, "Operators.create() failed"); } - return NULL; + return nullptr; } Py_RETURN_NONE; } @@ -569,15 +569,15 @@ PyDoc_STRVAR(Operators_reset_doc, static PyObject *Operators_reset(BPy_Operators * /*self*/, PyObject *args, PyObject *kwds) { - static const char *kwlist[] = {"delete_strokes", NULL}; - PyObject *obj1 = 0; + static const char *kwlist[] = {"delete_strokes", nullptr}; + PyObject *obj1 = nullptr; if (PyArg_ParseTupleAndKeywords(args, kwds, "|O!", (char **)kwlist, &PyBool_Type, &obj1)) { // true is the default Operators::reset(obj1 ? bool_from_PyBool(obj1) : true); } else { PyErr_SetString(PyExc_RuntimeError, "Operators.reset() failed"); - return NULL; + return nullptr; } Py_RETURN_NONE; } @@ -596,15 +596,15 @@ static PyObject *Operators_get_viewedge_from_index(BPy_Operators * /*self*/, PyObject *args, PyObject *kwds) { - static const char *kwlist[] = {"i", NULL}; + static const char *kwlist[] = {"i", nullptr}; unsigned int i; if (!PyArg_ParseTupleAndKeywords(args, kwds, "I", (char **)kwlist, &i)) { - return NULL; + return nullptr; } if (i >= Operators::getViewEdgesSize()) { PyErr_SetString(PyExc_IndexError, "index out of range"); - return NULL; + return nullptr; } return BPy_ViewEdge_from_ViewEdge(*(Operators::getViewEdgeFromIndex(i))); } @@ -623,15 +623,15 @@ static PyObject *Operators_get_chain_from_index(BPy_Operators * /*self*/, PyObject *args, PyObject *kwds) { - static const char *kwlist[] = {"i", NULL}; + static const char *kwlist[] = {"i", nullptr}; unsigned int i; if (!PyArg_ParseTupleAndKeywords(args, kwds, "I", (char **)kwlist, &i)) { - return NULL; + return nullptr; } if (i >= Operators::getChainsSize()) { PyErr_SetString(PyExc_IndexError, "index out of range"); - return NULL; + return nullptr; } return BPy_Chain_from_Chain(*(Operators::getChainFromIndex(i))); } @@ -650,15 +650,15 @@ static PyObject *Operators_get_stroke_from_index(BPy_Operators * /*self*/, PyObject *args, PyObject *kwds) { - static const char *kwlist[] = {"i", NULL}; + static const char *kwlist[] = {"i", nullptr}; unsigned int i; if (!PyArg_ParseTupleAndKeywords(args, kwds, "I", (char **)kwlist, &i)) { - return NULL; + return nullptr; } if (i >= Operators::getStrokesSize()) { PyErr_SetString(PyExc_IndexError, "index out of range"); - return NULL; + return nullptr; } return BPy_Stroke_from_Stroke(*(Operators::getStrokeFromIndex(i))); } @@ -760,48 +760,48 @@ static PyMethodDef BPy_Operators_methods[] = { (PyCFunction)Operators_get_strokes_size, METH_NOARGS | METH_STATIC, Operators_get_strokes_size_doc}, - {NULL, NULL, 0, NULL}, + {nullptr, nullptr, 0, nullptr}, }; /*-----------------------BPy_Operators type definition ------------------------------*/ PyTypeObject Operators_Type = { - PyVarObject_HEAD_INIT(NULL, 0) "Operators", /* tp_name */ + PyVarObject_HEAD_INIT(nullptr, 0) "Operators", /* tp_name */ sizeof(BPy_Operators), /* tp_basicsize */ 0, /* tp_itemsize */ (destructor)Operators_dealloc, /* tp_dealloc */ - 0, /* tp_print */ - 0, /* tp_getattr */ - 0, /* tp_setattr */ - 0, /* tp_reserved */ - 0, /* tp_repr */ - 0, /* tp_as_number */ - 0, /* tp_as_sequence */ - 0, /* tp_as_mapping */ - 0, /* tp_hash */ - 0, /* tp_call */ - 0, /* tp_str */ - 0, /* tp_getattro */ - 0, /* tp_setattro */ - 0, /* tp_as_buffer */ + nullptr, /* tp_print */ + nullptr, /* tp_getattr */ + nullptr, /* tp_setattr */ + nullptr, /* tp_reserved */ + nullptr, /* tp_repr */ + nullptr, /* tp_as_number */ + nullptr, /* tp_as_sequence */ + nullptr, /* tp_as_mapping */ + nullptr, /* tp_hash */ + nullptr, /* tp_call */ + nullptr, /* tp_str */ + nullptr, /* tp_getattro */ + nullptr, /* tp_setattro */ + nullptr, /* tp_as_buffer */ Py_TPFLAGS_DEFAULT, /* tp_flags */ Operators_doc, /* tp_doc */ - 0, /* tp_traverse */ - 0, /* tp_clear */ - 0, /* tp_richcompare */ + nullptr, /* tp_traverse */ + nullptr, /* tp_clear */ + nullptr, /* tp_richcompare */ 0, /* tp_weaklistoffset */ - 0, /* tp_iter */ - 0, /* tp_iternext */ + nullptr, /* tp_iter */ + nullptr, /* tp_iternext */ BPy_Operators_methods, /* tp_methods */ - 0, /* tp_members */ - 0, /* tp_getset */ - 0, /* tp_base */ - 0, /* tp_dict */ - 0, /* tp_descr_get */ - 0, /* tp_descr_set */ + nullptr, /* tp_members */ + nullptr, /* tp_getset */ + nullptr, /* tp_base */ + nullptr, /* tp_dict */ + nullptr, /* tp_descr_get */ + nullptr, /* tp_descr_set */ 0, /* tp_dictoffset */ - 0, /* tp_init */ - 0, /* tp_alloc */ + nullptr, /* tp_init */ + nullptr, /* tp_alloc */ PyType_GenericNew, /* tp_new */ }; |