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

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");
return -1;
}
self->m = new FrsMaterial( *m );
self->m = new FrsMaterial(*m);
} else if (float_array_from_PyObject(obj1, f1, 4) && obj2 &&
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)");
return -1;
}
self->borrowed = 0;
return 0;
}
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);
}