diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-01-04 11:56:25 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-01-04 11:56:25 +0300 |
commit | 9cafe19c707971f916060f94c40660e6b65a30e3 (patch) | |
tree | 756d94eb7925de0b2120886f1fe87d61eba3610a /source/blender/editors | |
parent | a735629fd17edd9c0919789dddabee71012fa6a5 (diff) |
- use BKE_keyingset_free_path where paths were being freed inline.
- rna_path was being freed when null, printing errors.
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/animation/keyingsets.c | 7 | ||||
-rw-r--r-- | source/blender/editors/space_outliner/outliner.c | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/source/blender/editors/animation/keyingsets.c b/source/blender/editors/animation/keyingsets.c index 09128672df8..433abc7d3d1 100644 --- a/source/blender/editors/animation/keyingsets.c +++ b/source/blender/editors/animation/keyingsets.c @@ -418,12 +418,9 @@ static int remove_keyingset_button_exec (bContext *C, wmOperator *op) /* try to find a path matching this description */ ksp= BKE_keyingset_find_path(ks, ptr.id.data, ks->name, path, index, KSP_GROUP_KSNAME); - + if (ksp) { - /* just free it... */ - MEM_freeN(ksp->rna_path); - BLI_freelinkN(&ks->paths, ksp); - + BKE_keyingset_free_path(ks, ksp); success= 1; } diff --git a/source/blender/editors/space_outliner/outliner.c b/source/blender/editors/space_outliner/outliner.c index b611322d7e9..799a4200ecf 100644 --- a/source/blender/editors/space_outliner/outliner.c +++ b/source/blender/editors/space_outliner/outliner.c @@ -4144,12 +4144,9 @@ static void do_outliner_keyingset_editop(SpaceOops *soops, KeyingSet *ks, ListBa if (ksp) { /* free path's data */ - // TODO: we probably need an API method for this - if (ksp->rna_path) MEM_freeN(ksp->rna_path); + BKE_keyingset_free_path(ks, ksp); + ks->active_path= 0; - - /* remove path from set */ - BLI_freelinkN(&ks->paths, ksp); } } break; |