diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-05-14 08:26:27 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-05-14 08:26:27 +0300 |
| commit | cdc7a93c3677ec166f4b375bc839feb415c3abdc (patch) | |
| tree | 6e4033081e9f21c3070a0ff5a1362cba36b0de34 /source/blender/python/intern | |
| parent | 1fadda344ca5349e55c19d8472e40f7e45e9e47f (diff) | |
| parent | 95a47ff2269fc97d60cf83a44726d1f49027a882 (diff) | |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender/python/intern')
| -rw-r--r-- | source/blender/python/intern/bpy_rna.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c index 55bf87051ec..39485f322d4 100644 --- a/source/blender/python/intern/bpy_rna.c +++ b/source/blender/python/intern/bpy_rna.c @@ -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); |