diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2020-01-10 15:33:25 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2020-01-29 13:44:56 +0300 |
| commit | aa123555d7a75c784f479b9572145f45862bcb2b (patch) | |
| tree | 03d0bc692a662accdd2c256a764f65c34f11b727 /source/blender/editors/transform/transform_convert.c | |
| parent | 67a60504990a6203304527a8bdb3a09041ca28d0 (diff) | |
Fix T73014: Marker sync does not work correctly if moving strip so it overlaps another strip
Need to also offset markers in BKE_sequence_base_shuffle_time().
Also clarify/correct related comments.
Maniphest Tasks: T73014
Differential Revision: https://developer.blender.org/D6555
Diffstat (limited to 'source/blender/editors/transform/transform_convert.c')
| -rw-r--r-- | source/blender/editors/transform/transform_convert.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/transform/transform_convert.c b/source/blender/editors/transform/transform_convert.c index a214eb1c80b..869c23de74c 100644 --- a/source/blender/editors/transform/transform_convert.c +++ b/source/blender/editors/transform/transform_convert.c @@ -1892,8 +1892,8 @@ void special_aftertrans_update(bContext *C, TransInfo *t) SpaceSeq *sseq = (SpaceSeq *)t->sa->spacedata.first; - /* marker transform, not especially nice but we may want to move markers - * at the same time as keyframes in the dope sheet. */ + /* Marker transform, not especially nice but we may want to move markers + * at the same time as strips in the Video Sequencer. */ if ((sseq->flag & SEQ_MARKER_TRANS) && (canceled == 0)) { /* cant use TFM_TIME_EXTEND * for some reason EXTEND is changed into TRANSLATE, so use frame_side instead */ |