Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Leung <aligorith@gmail.com>2007-04-21 07:54:16 +0400
committerJoshua Leung <aligorith@gmail.com>2007-04-21 07:54:16 +0400
commit6f9e78641cfb76189359489a1fb33596807b5e7a (patch)
treed0ba4b953548996a45b4b3ded59e8ebc4a2c9bd4 /source/blender/src/header_time.c
parent1bb2c03ee6b5f731785682989dfe4f9445fc56c4 (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/blender/src/header_time.c')
-rw-r--r--source/blender/src/header_time.c5
1 files changed, 3 insertions, 2 deletions
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;
}