Fix T100851: Sync markers does not work for numinput

special_aftertrans_update would always use TransInfo values (not
the values_final -- we need the final values to follow numinput, snapping,
etc).

Maniphest Tasks: T100851

Differential Revision: https://developer.blender.org/D15893
This commit is contained in:
Philipp Oeser 2022-09-06 12:58:29 +02:00
parent fd248e6bf9
commit 8c148a4f3b
Notes: blender-bot 2023-02-14 00:10:08 +01:00
Referenced by issue #88449: Blender LTS: Maintenance Task 2.93
Referenced by issue #88449, Blender LTS: Maintenance Task 2.93
Referenced by issue #100851, Sync markers option doesn't work when sliding keyframes with a keyboard entry
2 changed files with 5 additions and 5 deletions

View File

@ -888,18 +888,18 @@ void special_aftertrans_update__actedit(bContext *C, TransInfo *t)
if (ELEM(t->frame_side, 'L', 'R')) { /* TFM_TIME_EXTEND */
/* same as below */
ED_markers_post_apply_transform(
ED_context_get_markers(C), t->scene, t->mode, t->values[0], t->frame_side);
ED_context_get_markers(C), t->scene, t->mode, t->values_final[0], t->frame_side);
}
else /* TFM_TIME_TRANSLATE */
#endif
{
ED_markers_post_apply_transform(
ED_context_get_markers(C), t->scene, t->mode, t->values[0], t->frame_side);
ED_context_get_markers(C), t->scene, t->mode, t->values_final[0], t->frame_side);
}
}
else if (t->mode == TFM_TIME_SCALE) {
ED_markers_post_apply_transform(
ED_context_get_markers(C), t->scene, t->mode, t->values[0], t->frame_side);
ED_context_get_markers(C), t->scene, t->mode, t->values_final[0], t->frame_side);
}
}

View File

@ -805,12 +805,12 @@ void special_aftertrans_update__sequencer(bContext *UNUSED(C), TransInfo *t)
if (t->mode == TFM_SEQ_SLIDE) {
if (t->frame_side == 'B') {
ED_markers_post_apply_transform(
&t->scene->markers, t->scene, TFM_TIME_TRANSLATE, t->values[0], t->frame_side);
&t->scene->markers, t->scene, TFM_TIME_TRANSLATE, t->values_final[0], t->frame_side);
}
}
else if (ELEM(t->frame_side, 'L', 'R')) {
ED_markers_post_apply_transform(
&t->scene->markers, t->scene, TFM_TIME_EXTEND, t->values[0], t->frame_side);
&t->scene->markers, t->scene, TFM_TIME_EXTEND, t->values_final[0], t->frame_side);
}
}
}