diff options
author | Campbell Barton <ideasman42@gmail.com> | 2021-05-14 12:27:30 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2021-05-14 12:27:30 +0300 |
commit | bd5bab961edefdb69558a9771054beac676aeede (patch) | |
tree | 75f1b94f5088ec7ddbe05fba3dda5c66a0ce7648 /source/blender/python/intern | |
parent | 2871fadcad30fd9c5103022b782d986772301533 (diff) | |
parent | 3c09beb3b1f785c920eed3d61f7c2a2a06deba50 (diff) |
Merge branch 'blender-v2.93-release'
Diffstat (limited to 'source/blender/python/intern')
-rw-r--r-- | source/blender/python/intern/bpy_rna.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c index 354aa9b6986..1711637458a 100644 --- a/source/blender/python/intern/bpy_rna.c +++ b/source/blender/python/intern/bpy_rna.c @@ -5006,8 +5006,13 @@ static PyObject *pyrna_struct_pop(BPy_StructRNA *self, PyObject *args) idprop = IDP_GetPropertyFromGroup(group, key); if (idprop) { - PyObject *ret = BPy_IDGroup_WrapData(self->ptr.owner_id, idprop, group); - IDP_RemoveFromGroup(group, idprop); + /* Don't use #BPy_IDGroup_WrapData as the id-property is being removed from the ID. */ + PyObject *ret = BPy_IDGroup_MapDataToPy(idprop); + /* Internal error. */ + if (UNLIKELY(ret == NULL)) { + return NULL; + } + IDP_FreeFromGroup(group, idprop); return ret; } } |