diff options
| author | Joshua Leung <aligorith@gmail.com> | 2007-04-21 07:54:16 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2007-04-21 07:54:16 +0400 |
| commit | 6f9e78641cfb76189359489a1fb33596807b5e7a (patch) | |
| tree | d0ba4b953548996a45b4b3ded59e8ebc4a2c9bd4 /source | |
| parent | 1bb2c03ee6b5f731785682989dfe4f9445fc56c4 (diff) | |
== Preview Range ==
2 Bugfixes:
* EKEY in Timeline changed start frame of Preview Range too. Reported by slikdigit
on IRC
* SKEY in Timeline also didn't work correct as it was changing the end frame.
New Feature:
* Now OGL preview-render obeys Preview-Range settings.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/src/edittime.c | 5 | ||||
| -rw-r--r-- | source/blender/src/header_time.c | 5 | ||||
| -rw-r--r-- | source/blender/src/renderwin.c | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/source/blender/src/edittime.c b/source/blender/src/edittime.c index 593e88d26c2..487dd0fbe3b 100644 --- a/source/blender/src/edittime.c +++ b/source/blender/src/edittime.c @@ -926,7 +926,7 @@ void winqreadtimespace(ScrArea *sa, void *spacedata, BWinEvent *evt) break; case EKEY: /* set end frame */ if (G.scene->r.psfra) { - if (CFRA > G.scene->r.psfra) + if (CFRA < G.scene->r.psfra) G.scene->r.psfra= CFRA; G.scene->r.pefra= CFRA; } @@ -954,8 +954,9 @@ void winqreadtimespace(ScrArea *sa, void *spacedata, BWinEvent *evt) break; case SKEY: /* set start frame */ if (G.scene->r.psfra) { + if (G.scene->r.pefra < CFRA) + G.scene->r.pefra= CFRA; G.scene->r.psfra= CFRA; - G.scene->r.pefra= (EFRA > CFRA)? (EFRA):(CFRA); } else G.scene->r.sfra = CFRA; diff --git a/source/blender/src/header_time.c b/source/blender/src/header_time.c index 6f278a8e7fe..00ce8987d27 100644 --- a/source/blender/src/header_time.c +++ b/source/blender/src/header_time.c @@ -302,8 +302,9 @@ static void do_time_framemenu(void *arg, int event) switch(event) { case 1: /*Set as Start */ if (G.scene->r.psfra) { + if (G.scene->r.pefra < CFRA) + G.scene->r.pefra= CFRA; G.scene->r.psfra= CFRA; - G.scene->r.pefra= (EFRA > CFRA)? (EFRA):(CFRA); } else G.scene->r.sfra = CFRA; @@ -311,7 +312,7 @@ static void do_time_framemenu(void *arg, int event) break; case 2: /* Set as End */ if (G.scene->r.psfra) { - if (CFRA > G.scene->r.psfra) + if (CFRA < G.scene->r.psfra) G.scene->r.psfra= CFRA; G.scene->r.pefra= CFRA; } diff --git a/source/blender/src/renderwin.c b/source/blender/src/renderwin.c index 41a600d0eb4..8e34a258962 100644 --- a/source/blender/src/renderwin.c +++ b/source/blender/src/renderwin.c @@ -1275,7 +1275,7 @@ void BIF_do_ogl_render(View3D *v3d, int anim) if(BKE_imtype_is_movie(G.scene->r.imtype)) mh->start_movie(&G.scene->r, winx, winy); - for(CFRA= SFRA; CFRA<=EFRA; CFRA++) { + for(CFRA= PSFRA; CFRA<=PEFRA; CFRA++) { /* user event can close window */ if(render_win==NULL) break; |