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:
authorJiri Hnidek <jiri.hnidek@tul.cz>2005-09-12 12:43:09 +0400
committerJiri Hnidek <jiri.hnidek@tul.cz>2005-09-12 12:43:09 +0400
commit45fe89364de5c2ad7d924e666865e12f5705af55 (patch)
tree30458d2467797ef7da5d8c5fc493f2659bb657af /source/blender/src/drawtime.c
parenta4ca8267cf9be52945911553dca46a815dbba8ea (diff)
- timemarker name is moved up, when current frame equals to frame of timemarker
Diffstat (limited to 'source/blender/src/drawtime.c')
-rw-r--r--source/blender/src/drawtime.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/src/drawtime.c b/source/blender/src/drawtime.c
index 206e3132c38..1a2547b2aec 100644
--- a/source/blender/src/drawtime.c
+++ b/source/blender/src/drawtime.c
@@ -154,7 +154,10 @@ static void draw_marker(TimeMarker *marker)
}
else {
BIF_ThemeColor(TH_TEXT);
- glRasterPos2f(xpos+(4.0*(xspace/xpixels)), 17.0*yspace/ypixels);
+ if((marker->frame <= G.scene->r.cfra) && (marker->frame+5 > G.scene->r.cfra))
+ glRasterPos2f(xpos+(4.0*(xspace/xpixels)), 27.0*yspace/ypixels);
+ else
+ glRasterPos2f(xpos+(4.0*(xspace/xpixels)), 17.0*yspace/ypixels);
}
BMF_DrawString(G.font, marker->name);