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:
parent
ebc385de5f
commit
6d0f8d5a19
Notes:
blender-bot
2023-02-13 14:34:42 +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 #100749, Blender LTS: Maintenance Task 3.3 Referenced by issue #100851, Sync markers option doesn't work when sliding keyframes with a keyboard entry
|
@ -902,18 +902,18 @@ static 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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -708,12 +708,12 @@ static void special_aftertrans_update__sequencer(bContext *UNUSED(C), TransInfo
|
|||
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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue