diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-05-19 19:34:43 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-05-19 19:34:43 +0300 |
| commit | fe0025f2abd70ea8afa1b17307351df000fb86c5 (patch) | |
| tree | f04fd2f3f83640c9e994413b8d0a36a131339285 /source/blender/blenkernel/intern | |
| parent | b2d5d53fc846125b957c16572508f22e3b22ac8f (diff) | |
| parent | fccf253e3677e023e554641b6118366ef6df937e (diff) | |
Merge branch 'master' into gooseberry
Diffstat (limited to 'source/blender/blenkernel/intern')
| -rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 3375ba8f3de..1cff097df5e 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -254,15 +254,15 @@ void BKE_sequence_free_anim(Sequence *seq) { while (seq->anims.last) { StripAnim *sanim = seq->anims.last; - BLI_remlink(&seq->anims, sanim); if (sanim->anim) { IMB_free_anim(sanim->anim); sanim->anim = NULL; } - MEM_freeN(sanim); + BLI_freelinkN(&seq->anims, sanim); } + BLI_listbase_clear(&seq->anims); } /* cache must be freed before calling this function |