Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T74602: Sequencer slip operator ignores offset constraints

Browse Source 
Limit offsets, so each strip contains at least 1 frame of content.

Reviewed By: campbellbarton

Differential Revision: https://developer.blender.org/D7288
This commit is contained in:
Richard Antalik
2020-04-06 02:09:20 +02:00
parent d0d20de183
commit 0ca5b7b69b
1 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
source/blender/editors/space_sequencer/sequencer_edit.c
View File

@@ -1573,6 +1573,28 @@ static bool sequencer_slip_recursively(Scene *scene, SlipData *data, int offset)
return changed; return changed;
} }
/* Make sure, that each strip contains at least 1 frame of content. */
static void sequencer_slip_apply_limits(SlipData *data, int *offset)
{
for (int i = 0; i < data->num_seq; i++) {
if (data->trim[i]) {
Sequence *seq = data->seq_array[i];
int seq_content_start = data->ts[i].start + *offset;
int seq_content_end = seq_content_start + seq->len + seq->anim_startofs + seq->anim_endofs;
int diff = 0;
if (seq_content_start >= seq->enddisp) {
diff = seq->enddisp - seq_content_start - 1;
}
if (seq_content_end <= seq->startdisp) {
diff = seq->startdisp - seq_content_end + 1;
}
*offset += diff;
}
}
}
static int sequencer_slip_exec(bContext *C, wmOperator *op) static int sequencer_slip_exec(bContext *C, wmOperator *op)
{ {
SlipData *data; SlipData *data;
@@ -1601,6 +1623,7 @@ static int sequencer_slip_exec(bContext *C, wmOperator *op)
transseq_backup(data->ts + i, data->seq_array[i]); transseq_backup(data->ts + i, data->seq_array[i]);
} }
sequencer_slip_apply_limits(data, &offset);
success = sequencer_slip_recursively(scene, data, offset); success = sequencer_slip_recursively(scene, data, offset);
MEM_freeN(data->seq_array); MEM_freeN(data->seq_array);
@@ -1647,10 +1670,12 @@ static int sequencer_slip_modal(bContext *C, wmOperator *op, const wmEvent *even
/* Modal numinput active, try to handle numeric inputs. */ /* Modal numinput active, try to handle numeric inputs. */
if (event->val == KM_PRESS && has_numInput && handleNumInput(C, &data->num_input, event)) { if (event->val == KM_PRESS && has_numInput && handleNumInput(C, &data->num_input, event)) {
float offset; float offset_fl;
applyNumInput(&data->num_input, &offset); applyNumInput(&data->num_input, &offset_fl);
int offset = round_fl_to_int(offset_fl);
sequencer_slip_update_header(scene, area, data, (int)offset); sequencer_slip_apply_limits(data, &offset);
sequencer_slip_update_header(scene, area, data, offset);
RNA_int_set(op->ptr, "offset", offset); RNA_int_set(op->ptr, "offset", offset);
@@ -1682,6 +1707,7 @@ static int sequencer_slip_modal(bContext *C, wmOperator *op, const wmEvent *even
UI_view2d_region_to_view(v2d, mouse_x, 0, &mouseloc[0], &mouseloc[1]); UI_view2d_region_to_view(v2d, mouse_x, 0, &mouseloc[0], &mouseloc[1]);
offset = mouseloc[0] - data->init_mouseloc[0]; offset = mouseloc[0] - data->init_mouseloc[0];
sequencer_slip_apply_limits(data, &offset);
sequencer_slip_update_header(scene, area, data, offset); sequencer_slip_update_header(scene, area, data, offset);
RNA_int_set(op->ptr, "offset", offset); RNA_int_set(op->ptr, "offset", offset);
@@ -1761,10 +1787,12 @@ static int sequencer_slip_modal(bContext *C, wmOperator *op, const wmEvent *even
/* Modal numinput inactive, try to handle numeric inputs. */ /* Modal numinput inactive, try to handle numeric inputs. */
if (!handled && event->val == KM_PRESS && handleNumInput(C, &data->num_input, event)) { if (!handled && event->val == KM_PRESS && handleNumInput(C, &data->num_input, event)) {
float offset; float offset_fl;
applyNumInput(&data->num_input, &offset); applyNumInput(&data->num_input, &offset_fl);
int offset = round_fl_to_int(offset_fl);
sequencer_slip_update_header(scene, area, data, (int)offset); sequencer_slip_apply_limits(data, &offset);
sequencer_slip_update_header(scene, area, data, offset);
RNA_int_set(op->ptr, "offset", offset); RNA_int_set(op->ptr, "offset", offset);