archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Replaced PyTuple_SetItem by PyTuple_SET_ITEM when creating new tuples.

Browse Source
This commit is contained in:
Tamito Kajiyama
2013-02-03 22:40:10 +00:00
parent 7e3e3a2270
commit 879602d441
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/freestyle/intern/python/BPy_Convert.cpp
View File

@@ -208,7 +208,7 @@ PyObject * BPy_Nature_from_Nature( unsigned short n ) {
PyObject *py_n;
PyObject *args = PyTuple_New(1);
PyTuple_SetItem( args, 0, PyLong_FromLong(n) );
PyTuple_SET_ITEM( args, 0, PyLong_FromLong(n) );
py_n = Nature_Type.tp_new(&Nature_Type, args, NULL);
Py_DECREF(args);
@@ -235,7 +235,7 @@ PyObject * BPy_MediumType_from_MediumType( Stroke::MediumType n ) {
PyObject *py_mt;
PyObject *args = PyTuple_New(1);
PyTuple_SetItem( args, 0, PyLong_FromLong(n) );
PyTuple_SET_ITEM( args, 0, PyLong_FromLong(n) );
py_mt = MediumType_Type.tp_new( &MediumType_Type, args, NULL );
Py_DECREF(args);
@@ -334,7 +334,7 @@ PyObject * BPy_IntegrationType_from_IntegrationType( IntegrationType i ) {
PyObject *py_it;
PyObject *args = PyTuple_New(1);
PyTuple_SetItem( args, 0, PyLong_FromLong(i) );
PyTuple_SET_ITEM( args, 0, PyLong_FromLong(i) );
py_it = IntegrationType_Type.tp_new( &IntegrationType_Type, args, NULL );
Py_DECREF(args);
@@ -353,8 +353,8 @@ PyObject * BPy_CurvePoint_from_CurvePoint( CurvePoint& cp ) {
PyObject * BPy_directedViewEdge_from_directedViewEdge( ViewVertex::directedViewEdge& dve ) {
PyObject *py_dve = PyTuple_New(2);
PyTuple_SetItem( py_dve, 0, BPy_ViewEdge_from_ViewEdge(*(dve.first)) );
PyTuple_SetItem( py_dve, 1, PyBool_from_bool(dve.second) );
PyTuple_SET_ITEM( py_dve, 0, BPy_ViewEdge_from_ViewEdge(*(dve.first)) );
PyTuple_SET_ITEM( py_dve, 1, PyBool_from_bool(dve.second) );
return py_dve;
}

14
source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp
View File

@@ -261,13 +261,13 @@ static PyObject *SVertex_curvatures( BPy_SVertex *self , PyObject *args) {
Vec3r e2(info->e2.x(), info->e2.y(), info->e2.z());
Vec3r er(info->er.x(), info->er.y(), info->er.z());
PyObject *retval = PyTuple_New(7);
PyTuple_SetItem( retval, 0, PyFloat_FromDouble(info->K1));
PyTuple_SetItem( retval, 2, Vector_from_Vec3r(e1));
PyTuple_SetItem( retval, 1, PyFloat_FromDouble(info->K2));
PyTuple_SetItem( retval, 3, Vector_from_Vec3r(e2));
PyTuple_SetItem( retval, 4, PyFloat_FromDouble(info->Kr));
PyTuple_SetItem( retval, 5, Vector_from_Vec3r(er));
PyTuple_SetItem( retval, 6, PyFloat_FromDouble(info->dKr));
PyTuple_SET_ITEM( retval, 0, PyFloat_FromDouble(info->K1));
PyTuple_SET_ITEM( retval, 2, Vector_from_Vec3r(e1));
PyTuple_SET_ITEM( retval, 1, PyFloat_FromDouble(info->K2));
PyTuple_SET_ITEM( retval, 3, Vector_from_Vec3r(e2));
PyTuple_SET_ITEM( retval, 4, PyFloat_FromDouble(info->Kr));
PyTuple_SET_ITEM( retval, 5, Vector_from_Vec3r(er));
PyTuple_SET_ITEM( retval, 6, PyFloat_FromDouble(info->dKr));
return retval;
}