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

Fix for pointers to auto variables returned from Python wrapper class methods.

Browse Source 
The previous implementation was a quick workaround of C++ const references.

Also removed the unused 'borrowed' flag from the Python wrapper of FrsMaterial.
This commit is contained in:
Tamito Kajiyama
2013-02-16 17:13:59 +00:00
parent 06c51df4db
commit 90ed5ea4ea
6 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -322,10 +322,9 @@ PyObject * BPy_ViewShape_from_ViewShape( ViewShape& vs ) {
return py_vs; return py_vs;
} }
PyObject * BPy_FrsMaterial_from_FrsMaterial( FrsMaterial& m ){ PyObject * BPy_FrsMaterial_from_FrsMaterial(const FrsMaterial& m) {
PyObject *py_m = FrsMaterial_Type.tp_new( &FrsMaterial_Type, 0, 0 ); PyObject *py_m = FrsMaterial_Type.tp_new( &FrsMaterial_Type, 0, 0 );
((BPy_FrsMaterial*) py_m)->m = &m; ((BPy_FrsMaterial*) py_m)->m = new FrsMaterial( m );
((BPy_FrsMaterial*) py_m)->borrowed = 1;
return py_m; return py_m;
} }

2
source/blender/freestyle/intern/python/BPy_Convert.h
View File

@@ -88,7 +88,7 @@ PyObject * BPy_Id_from_Id( Id& id );
PyObject * BPy_Interface0D_from_Interface0D( Interface0D& if0D ); PyObject * BPy_Interface0D_from_Interface0D( Interface0D& if0D );
PyObject * BPy_Interface1D_from_Interface1D( Interface1D& if1D ); PyObject * BPy_Interface1D_from_Interface1D( Interface1D& if1D );
PyObject * BPy_IntegrationType_from_IntegrationType( IntegrationType i ); PyObject * BPy_IntegrationType_from_IntegrationType( IntegrationType i );
PyObject * BPy_FrsMaterial_from_FrsMaterial( FrsMaterial& m ); PyObject * BPy_FrsMaterial_from_FrsMaterial(const FrsMaterial& m);
PyObject * BPy_Nature_from_Nature( unsigned short n ); PyObject * BPy_Nature_from_Nature( unsigned short n );
PyObject * BPy_MediumType_from_MediumType( Stroke::MediumType n ); PyObject * BPy_MediumType_from_MediumType( Stroke::MediumType n );
PyObject * BPy_SShape_from_SShape( SShape& ss ); PyObject * BPy_SShape_from_SShape( SShape& ss );

6
source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
View File

@@ -75,7 +75,7 @@ static int FrsMaterial_init(BPy_FrsMaterial *self, PyObject *args, PyObject *kwd
PyErr_SetString(PyExc_RuntimeError, "invalid FrsMaterial object"); PyErr_SetString(PyExc_RuntimeError, "invalid FrsMaterial object");
return -1; return -1;
} }
self->m = new FrsMaterial( *m ); self->m = new FrsMaterial(*m);
} else if (float_array_from_PyObject(obj1, f1, 4) && obj2 && } else if (float_array_from_PyObject(obj1, f1, 4) && obj2 &&
float_array_from_PyObject(obj2, f2, 4) && obj3 && float_array_from_PyObject(obj2, f2, 4) && obj3 &&
@@ -87,15 +87,13 @@ static int FrsMaterial_init(BPy_FrsMaterial *self, PyObject *args, PyObject *kwd
PyErr_SetString(PyExc_TypeError, "invalid argument(s)"); PyErr_SetString(PyExc_TypeError, "invalid argument(s)");
return -1; return -1;
} }
self->borrowed = 0;
return 0; return 0;
} }
static void FrsMaterial_dealloc(BPy_FrsMaterial* self) static void FrsMaterial_dealloc(BPy_FrsMaterial* self)
{ {
if (self->m && !self->borrowed) delete self->m;
delete self->m;
Py_TYPE(self)->tp_free((PyObject*)self); Py_TYPE(self)->tp_free((PyObject*)self);
} }

1
source/blender/freestyle/intern/python/BPy_FrsMaterial.h
View File

@@ -19,7 +19,6 @@ extern PyTypeObject FrsMaterial_Type;
typedef struct { typedef struct {
PyObject_HEAD PyObject_HEAD
FrsMaterial *m; FrsMaterial *m;
int borrowed; /* non-zero if *m is a borrowed object */
} BPy_FrsMaterial; } BPy_FrsMaterial;
/*---------------------------Python BPy_FrsMaterial visible prototypes-----------*/ /*---------------------------Python BPy_FrsMaterial visible prototypes-----------*/

8
source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp
View File

@@ -288,9 +288,7 @@ PyDoc_STRVAR(FEdgeSharp_material_right_doc,
static PyObject *FEdgeSharp_material_right_get(BPy_FEdgeSharp *self, void *UNUSED(closure)) static PyObject *FEdgeSharp_material_right_get(BPy_FEdgeSharp *self, void *UNUSED(closure))
{ {
// FIXME aFrsMaterial() returns a const reference. return BPy_FrsMaterial_from_FrsMaterial(self->fes->aFrsMaterial());
FrsMaterial m(self->fes->aFrsMaterial());
return BPy_FrsMaterial_from_FrsMaterial(m);
} }
PyDoc_STRVAR(FEdgeSharp_material_left_doc, PyDoc_STRVAR(FEdgeSharp_material_left_doc,
@@ -300,9 +298,7 @@ PyDoc_STRVAR(FEdgeSharp_material_left_doc,
static PyObject *FEdgeSharp_material_left_get(BPy_FEdgeSharp *self, void *UNUSED(closure)) static PyObject *FEdgeSharp_material_left_get(BPy_FEdgeSharp *self, void *UNUSED(closure))
{ {
// FIXME bFrsMaterial() returns a const reference. return BPy_FrsMaterial_from_FrsMaterial(self->fes->bFrsMaterial());
FrsMaterial m(self->fes->bFrsMaterial());
return BPy_FrsMaterial_from_FrsMaterial(m);
} }
PyDoc_STRVAR(FEdgeSharp_face_mark_right_doc, PyDoc_STRVAR(FEdgeSharp_face_mark_right_doc,

4
source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp
View File

@@ -179,9 +179,7 @@ PyDoc_STRVAR(FEdgeSmooth_material_doc,
static PyObject *FEdgeSmooth_material_get(BPy_FEdgeSmooth *self, void *UNUSED(closure)) static PyObject *FEdgeSmooth_material_get(BPy_FEdgeSmooth *self, void *UNUSED(closure))
{ {
// FIXME frs_material() returns a const reference. return BPy_FrsMaterial_from_FrsMaterial(self->fes->frs_material());
FrsMaterial m(self->fes->frs_material());
return BPy_FrsMaterial_from_FrsMaterial(m);
} }
PyDoc_STRVAR(FEdgeSmooth_face_mark_doc, PyDoc_STRVAR(FEdgeSmooth_face_mark_doc,