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

bmesh operator py api:

Browse Source 
- fix for incorrect bmesh operator type-check for mapping slots.
- fix for python causing an assert when invalid args are given.
- fix memory leak with some exceptions.
This commit is contained in:
Campbell Barton
2012-11-28 15:07:57 +00:00
parent cac253a502
commit 96136d3d88
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/python/bmesh/bmesh_py_ops_call.c
View File

@@ -584,8 +584,6 @@ static PyObject* bpy_slot_to_py(BMesh *bm, BMOpSlot *slot)
PyObject *py_key = BPy_BMElem_CreatePyObject(bm, ele_key); PyObject *py_key = BPy_BMElem_CreatePyObject(bm, ele_key);
PyObject *py_val = BPy_BMElem_CreatePyObject(bm, *(void **)BMO_OP_SLOT_MAPPING_DATA(ele_val)); PyObject *py_val = BPy_BMElem_CreatePyObject(bm, *(void **)BMO_OP_SLOT_MAPPING_DATA(ele_val));
BLI_assert(slot->slot_subtype.elem & ((BPy_BMElem *)py_val)->ele->head.htype);
PyDict_SetItem(item, py_key, py_val); PyDict_SetItem(item, py_key, py_val);
Py_DECREF(py_key); Py_DECREF(py_key);
Py_DECREF(py_val); Py_DECREF(py_val);
@@ -714,19 +712,23 @@ PyObject *BPy_BMO_call(BPy_BMeshOpFunc *self, PyObject *args, PyObject *kw)
Py_ssize_t pos = 0; Py_ssize_t pos = 0;
while (PyDict_Next(kw, &pos, &key, &value)) { while (PyDict_Next(kw, &pos, &key, &value)) {
const char *slot_name = _PyUnicode_AsString(key); const char *slot_name = _PyUnicode_AsString(key);
BMOpSlot *slot = BMO_slot_get(bmop.slots_in, slot_name); BMOpSlot *slot;
if (slot == NULL) { if (!BMO_slot_exists(bmop.slots_in, slot_name)) {
PyErr_Format(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"%.200s: keyword \"%.200s\" is invalid for this operator", "%.200s: keyword \"%.200s\" is invalid for this operator",
self->opname, slot_name); self->opname, slot_name);
BMO_op_finish(bm, &bmop);
return NULL; return NULL;
} }
slot = BMO_slot_get(bmop.slots_in, slot_name);
/* now assign the value */ /* now assign the value */
if (bpy_slot_from_py(bm, &bmop, slot, value, if (bpy_slot_from_py(bm, &bmop, slot, value,
self->opname, slot_name) == -1) self->opname, slot_name) == -1)
{ {
BMO_op_finish(bm, &bmop);
return NULL; return NULL;
} }
} }