diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-07-24 11:11:00 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-07-24 11:11:00 +0400 |
| commit | 57a4070b9d6da6151f1ff3d9cb4f88342be2dc5f (patch) | |
| tree | 6c6b23de2b9fe10d5aea5e209edb03fe2b756f92 /source/blender/blenkernel/intern/sequencer.c | |
| parent | 576161b18673ef5cd5833330d4bfbf1266c3f624 (diff) | |
sequencer: replace warning message with assert, was printing when copying masks and movieclips but went by unnoticed.
Diffstat (limited to 'source/blender/blenkernel/intern/sequencer.c')
| -rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 1dba2bd8eb9..34b19e3f357 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -4315,6 +4315,12 @@ static Sequence *seq_dupli(Scene *scene, Scene *scene_to, Sequence *seq, int dup if (seq->scene_sound) seqn->scene_sound = sound_scene_add_scene_sound_defaults(sce_audio, seqn); } + else if (seq->type == SEQ_TYPE_MOVIECLIP) { + /* avoid assert */ + } + else if (seq->type == SEQ_TYPE_MASK) { + /* avoid assert */ + } else if (seq->type == SEQ_TYPE_MOVIE) { seqn->strip->stripdata = MEM_dupallocN(seq->strip->stripdata); @@ -4326,7 +4332,7 @@ static Sequence *seq_dupli(Scene *scene, Scene *scene_to, Sequence *seq, int dup if (seq->scene_sound) seqn->scene_sound = sound_add_scene_sound_defaults(sce_audio, seqn); - seqn->sound->id.us++; + id_us_plus((ID *)seqn->sound); } else if (seq->type == SEQ_TYPE_IMAGE) { seqn->strip->stripdata = @@ -4348,7 +4354,8 @@ static Sequence *seq_dupli(Scene *scene, Scene *scene_to, Sequence *seq, int dup } else { - fprintf(stderr, "Aiiiiekkk! sequence type not handled in duplicate!\nExpect a crash now...\n"); + /* sequence type not handled in duplicate! Expect a crash now... */ + BLI_assert(0); } if (dupe_flag & SEQ_DUPE_UNIQUE_NAME) |