forked from bartvdbraak/blender
Full screen mode did not remember the follow mode of previous screen.
Also make follow mode do something similar in reverse play.
This commit is contained in:
parent
de85d6cdbf
commit
26d7ac5077
@ -1885,6 +1885,7 @@ ScrArea *ED_screen_state_toggle(bContext *C, wmWindow *win, ScrArea *sa, const s
|
|||||||
BLI_snprintf(newname, sizeof(newname), "%s-%s", oldscreen->id.name + 2, "nonnormal");
|
BLI_snprintf(newname, sizeof(newname), "%s-%s", oldscreen->id.name + 2, "nonnormal");
|
||||||
sc = ED_screen_add(win, oldscreen->scene, newname);
|
sc = ED_screen_add(win, oldscreen->scene, newname);
|
||||||
sc->state = state;
|
sc->state = state;
|
||||||
|
sc->redraws_flag = oldscreen->redraws_flag;
|
||||||
|
|
||||||
/* timer */
|
/* timer */
|
||||||
sc->animtimer = oldscreen->animtimer;
|
sc->animtimer = oldscreen->animtimer;
|
||||||
|
@ -3486,7 +3486,11 @@ static int screen_animation_step(bContext *C, wmOperator *UNUSED(op), const wmEv
|
|||||||
(sa->spacetype == SPACE_CLIP && ar->regiontype == RGN_TYPE_PREVIEW))
|
(sa->spacetype == SPACE_CLIP && ar->regiontype == RGN_TYPE_PREVIEW))
|
||||||
{
|
{
|
||||||
float w = BLI_rctf_size_x(&ar->v2d.cur);
|
float w = BLI_rctf_size_x(&ar->v2d.cur);
|
||||||
if (scene->r.cfra < ar->v2d.cur.xmin || scene->r.cfra > (ar->v2d.cur.xmax)) {
|
if (scene->r.cfra < ar->v2d.cur.xmin) {
|
||||||
|
ar->v2d.cur.xmax = scene->r.cfra;
|
||||||
|
ar->v2d.cur.xmin = ar->v2d.cur.xmin - w;
|
||||||
|
}
|
||||||
|
else if (scene->r.cfra > ar->v2d.cur.xmax) {
|
||||||
ar->v2d.cur.xmin = scene->r.cfra;
|
ar->v2d.cur.xmin = scene->r.cfra;
|
||||||
ar->v2d.cur.xmax = ar->v2d.cur.xmin + w;
|
ar->v2d.cur.xmax = ar->v2d.cur.xmin + w;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user