diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-02-16 21:13:59 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-02-16 21:13:59 +0400 |
commit | 90ed5ea4ea278b4aadf9187e4e2b92ef3221001b (patch) | |
tree | 4cef16d0a4333db6e08c82e2860b6256b8a0b392 /source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp | |
parent | 06c51df4dbbba27d273514d922e20f89e5a1e025 (diff) |
Fix for pointers to auto variables returned from Python wrapper class methods.
The previous implementation was a quick workaround of C++ const references.
Also removed the unused 'borrowed' flag from the Python wrapper of FrsMaterial.
Diffstat (limited to 'source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp')
-rw-r--r-- | source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp b/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp index 153d454a720..8d651c702b0 100644 --- a/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp +++ b/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp @@ -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); } |