diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-01 19:26:42 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-01 19:26:42 +0300 |
| commit | bfe1d0e0dc6281d33448c3d4ddfa2e231bbc5566 (patch) | |
| tree | 14e9db1c58d7ffc33becc3ff5d74f4feb4c2d75e /source/blender/editors/space_sequencer/sequencer_edit.c | |
| parent | 297bf7235bc4b2384b99f41676a8c217f2ee3249 (diff) | |
| parent | 75fc1c35070e0cf247f2d2e4cffe8a6e711522ff (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_sequencer/sequencer_edit.c')
| -rw-r--r-- | source/blender/editors/space_sequencer/sequencer_edit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index 999e0fbf2a4..a4834caf709 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -892,7 +892,7 @@ static Sequence *cut_seq_soft(Scene *scene, Sequence *seq, int cutframe) /* like duplicate, but only duplicate and cut overlapping strips, - * strips to the left of the cutframe are ignored and strips to the right + * strips to the left of the cutframe are ignored and strips to the right * are moved to the end of slist * we have to work on the same slist (not using a separate list), since * otherwise dupli_seq can't check for duplicate names properly and |