Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacques Lucke <mail@jlucke.com>2019-05-16 15:11:11 +0300
committerJacques Lucke <mail@jlucke.com>2019-05-16 15:11:11 +0300
commitdb5120603f8f6236d1417199f257e35e0eb8c00b (patch)
treeb2c55dedaf2b49ac8abd4f50878bcf374e71cccb /source/blender/editors/armature
parentc0d743238d022e12872549176257db8b9d602e3d (diff)
Refactor: Simplify ID Property freeing
This also makes `IDP_CopyProperty` the "opposite" of `IDP_FreeProperty`, which is what I'd expect. Two refactoring steps: * rename IDP_FreeProperty to IDP_FreePropertyContent * new IDP_FreeProperty function that actually frees the property Reviewers: brecht Differential Revision: https://developer.blender.org/D4872
Diffstat (limited to 'source/blender/editors/armature')
-rw-r--r--source/blender/editors/armature/armature_utils.c3
-rw-r--r--source/blender/editors/armature/pose_lib.c1
-rw-r--r--source/blender/editors/armature/pose_transform.c1
-rw-r--r--source/blender/editors/armature/pose_utils.c1
4 files changed, 0 insertions, 6 deletions
diff --git a/source/blender/editors/armature/armature_utils.c b/source/blender/editors/armature/armature_utils.c
index 20dc7b6c826..27076f84c7f 100644
--- a/source/blender/editors/armature/armature_utils.c
+++ b/source/blender/editors/armature/armature_utils.c
@@ -127,7 +127,6 @@ void bone_free(bArmature *arm, EditBone *bone)
if (bone->prop) {
IDP_FreeProperty(bone->prop);
- MEM_freeN(bone->prop);
}
/* Clear references from other edit bones. */
@@ -777,7 +776,6 @@ void ED_armature_edit_free(struct bArmature *arm)
for (eBone = arm->edbo->first; eBone; eBone = eBone->next) {
if (eBone->prop) {
IDP_FreeProperty(eBone->prop);
- MEM_freeN(eBone->prop);
}
}
@@ -811,7 +809,6 @@ void ED_armature_ebone_listbase_free(ListBase *lb)
if (ebone->prop) {
IDP_FreeProperty(ebone->prop);
- MEM_freeN(ebone->prop);
}
MEM_freeN(ebone);
diff --git a/source/blender/editors/armature/pose_lib.c b/source/blender/editors/armature/pose_lib.c
index 7b31897766d..4bcfdc700b3 100644
--- a/source/blender/editors/armature/pose_lib.c
+++ b/source/blender/editors/armature/pose_lib.c
@@ -1018,7 +1018,6 @@ static void poselib_backup_free_data(tPoseLib_PreviewData *pld)
/* free custom data */
if (plb->oldprops) {
IDP_FreeProperty(plb->oldprops);
- MEM_freeN(plb->oldprops);
}
/* free backup element now */
diff --git a/source/blender/editors/armature/pose_transform.c b/source/blender/editors/armature/pose_transform.c
index 49b66429515..ed728714c5b 100644
--- a/source/blender/editors/armature/pose_transform.c
+++ b/source/blender/editors/armature/pose_transform.c
@@ -1225,7 +1225,6 @@ static int pose_clear_user_transforms_exec(bContext *C, wmOperator *op)
for (pchan = dummyPose->chanbase.first; pchan; pchan = pchan->next) {
if (pchan->prop) {
IDP_FreeProperty(pchan->prop);
- MEM_freeN(pchan->prop);
}
}
diff --git a/source/blender/editors/armature/pose_utils.c b/source/blender/editors/armature/pose_utils.c
index a1f763ac57d..fbaf2c896d0 100644
--- a/source/blender/editors/armature/pose_utils.c
+++ b/source/blender/editors/armature/pose_utils.c
@@ -203,7 +203,6 @@ void poseAnim_mapping_free(ListBase *pfLinks)
/* free custom properties */
if (pfl->oldprops) {
IDP_FreeProperty(pfl->oldprops);
- MEM_freeN(pfl->oldprops);
}
/* free list of F-Curve reference links */