diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-04-02 13:30:10 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-04-02 13:30:10 +0300 |
commit | 274bb10a3624ac8cb3c5b6f839035574d6a41420 (patch) | |
tree | 4e41d9248e0fa3bd398fa81d3c479d8c706db94f /source/blender/blenkernel/intern/sequencer.c | |
parent | ebf079c00404590ef0e964e6c42b0883357bb79f (diff) | |
parent | 2fc69d11c8a2df89c32a8bb320da2350fff7c8ba (diff) |
Merge branch 'master' into gooseberry
Diffstat (limited to 'source/blender/blenkernel/intern/sequencer.c')
-rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index ad34f351b17..0cf51c7409f 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -66,6 +66,7 @@ #include "BKE_scene.h" #include "BKE_mask.h" #include "BKE_library.h" +#include "BKE_idprop.h" #include "RNA_access.h" @@ -210,6 +211,11 @@ static void BKE_sequence_free_ex(Scene *scene, Sequence *seq, const bool do_cach seq_free_animdata(scene, seq); } + if (seq->prop) { + IDP_FreeProperty(seq->prop); + MEM_freeN(seq->prop); + } + /* free modifiers */ BKE_sequence_modifier_clear(seq); @@ -4693,6 +4699,10 @@ static Sequence *seq_dupli(Scene *scene, Scene *scene_to, Sequence *seq, int dup seqn->strip->proxy->anim = NULL; } + if (seq->prop) { + seqn->prop = IDP_CopyProperty(seq->prop); + } + if (seqn->modifiers.first) { BLI_listbase_clear(&seqn->modifiers); |