Merge branch 'blender-v2.83-release'

This commit is contained in:
Campbell Barton 2020-05-14 15:26:27 +10:00
commit cdc7a93c36
1 changed files with 2 additions and 1 deletions

View File

@ -9056,9 +9056,10 @@ void pyrna_struct_type_extend_capi(struct StructRNA *srna,
}
if (getset != NULL) {
PyObject *dict = ((PyTypeObject *)cls)->tp_dict;
for (; getset->name != NULL; getset++) {
PyObject *dict = ((PyTypeObject *)cls)->tp_dict;
PyObject *descr = PyDescr_NewGetSet((PyTypeObject *)cls, getset);
/* Ensure we're not overwriting anything that already exists. */
BLI_assert(PyDict_GetItem(dict, PyDescr_NAME(descr)) == NULL);
PyDict_SetItem(dict, PyDescr_NAME(descr), descr);
Py_DECREF(descr);