From 0db98b214d468864630fc9bba72be4ff9b2548e5 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Fri, 2 Oct 2020 17:38:28 +0200 Subject: Fix T81345: part four, fix handling of IDProperties in edit armature undo. Specific armature editing undo code would duplicate and store a list of editbones. However, those are not linked to main data storage and should therefore never affect ID usercounting. --- source/blender/editors/armature/armature_utils.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'source/blender/editors/armature/armature_utils.c') diff --git a/source/blender/editors/armature/armature_utils.c b/source/blender/editors/armature/armature_utils.c index 29df8b31819..fba88e78162 100644 --- a/source/blender/editors/armature/armature_utils.c +++ b/source/blender/editors/armature/armature_utils.c @@ -35,6 +35,7 @@ #include "BKE_deform.h" #include "BKE_global.h" #include "BKE_idprop.h" +#include "BKE_lib_id.h" #include "BKE_main.h" #include "DEG_depsgraph.h" @@ -847,7 +848,7 @@ void ED_armature_to_edit(bArmature *arm) /* free's bones and their properties */ -void ED_armature_ebone_listbase_free(ListBase *lb) +void ED_armature_ebone_listbase_free(ListBase *lb, const bool do_id_user) { EditBone *ebone, *ebone_next; @@ -855,7 +856,7 @@ void ED_armature_ebone_listbase_free(ListBase *lb) ebone_next = ebone->next; if (ebone->prop) { - IDP_FreeProperty(ebone->prop); + IDP_FreeProperty_ex(ebone->prop, do_id_user); } MEM_freeN(ebone); @@ -864,7 +865,7 @@ void ED_armature_ebone_listbase_free(ListBase *lb) BLI_listbase_clear(lb); } -void ED_armature_ebone_listbase_copy(ListBase *lb_dst, ListBase *lb_src) +void ED_armature_ebone_listbase_copy(ListBase *lb_dst, ListBase *lb_src, const bool do_id_user) { EditBone *ebone_src; EditBone *ebone_dst; @@ -874,7 +875,8 @@ void ED_armature_ebone_listbase_copy(ListBase *lb_dst, ListBase *lb_src) for (ebone_src = lb_src->first; ebone_src; ebone_src = ebone_src->next) { ebone_dst = MEM_dupallocN(ebone_src); if (ebone_dst->prop) { - ebone_dst->prop = IDP_CopyProperty(ebone_dst->prop); + ebone_dst->prop = IDP_CopyProperty_ex(ebone_dst->prop, + do_id_user ? 0 : LIB_ID_CREATE_NO_USER_REFCOUNT); } ebone_src->temp.ebone = ebone_dst; BLI_addtail(lb_dst, ebone_dst); -- cgit v1.2.3