diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2011-07-22 01:11:58 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2011-07-22 01:11:58 +0400 |
| commit | 4532bd731d5edbe348d4df810856f6bdfdea705c (patch) | |
| tree | 778fdcd594b5f384eacf5cd82f50afc10bbed513 /source/blender/blenkernel/intern/sequencer.c | |
| parent | cf34f7509f4ea8c3f0c92045933f089c72de5313 (diff) | |
| parent | bbfe3c9c49523d3987a3144da119d8f6afd09cf9 (diff) | |
Merge with trunk up to r38584.
Diffstat (limited to 'source/blender/blenkernel/intern/sequencer.c')
| -rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 8f7076c3374..5da70f97314 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -3233,9 +3233,10 @@ int seq_swap(Sequence *seq_a, Sequence *seq_b, const char **error_str) { char name[sizeof(seq_a->name)]; - if(seq_a->len != seq_b->len) + if(seq_a->len != seq_b->len) { *error_str= "Strips must be the same length"; return 0; + } /* type checking, could be more advanced but disalow sound vs non-sound copy */ if(seq_a->type != seq_b->type) { |