From b445467f15f32597df536039737cbb1aeca3b707 Mon Sep 17 00:00:00 2001 From: Joshua Leung Date: Fri, 28 Jan 2011 00:52:31 +0000 Subject: In the Timeline, keyframe lines are now drawn in front of the frame indicator. This is so that it will be possible to see if there is a keyframe on the current frame by just looking in the timeline. --- source/blender/editors/space_time/space_time.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source/blender/editors/space_time') diff --git a/source/blender/editors/space_time/space_time.c b/source/blender/editors/space_time/space_time.c index 4a45b6b6cbb..8a692a60777 100644 --- a/source/blender/editors/space_time/space_time.c +++ b/source/blender/editors/space_time/space_time.c @@ -466,15 +466,15 @@ static void time_main_area_draw(const bContext *C, ARegion *ar) UI_view2d_grid_draw(v2d, grid, (V2D_VERTICAL_LINES|V2D_VERTICAL_AXIS)); UI_view2d_grid_free(grid); - /* keyframes */ - if(!G.rendering) /* ANIM_nla_mapping_apply_fcurve() modifies curve data while rendering, possible race condition */ - time_draw_keyframes(C, stime, ar); - /* current frame */ if ((stime->flag & TIME_DRAWFRAMES)==0) flag |= DRAWCFRA_UNIT_SECONDS; if (stime->flag & TIME_CFRA_NUM) flag |= DRAWCFRA_SHOW_NUMBOX; ANIM_draw_cfra(C, v2d, flag); + /* keyframes */ + if(!G.rendering) /* ANIM_nla_mapping_apply_fcurve() modifies curve data while rendering, possible race condition */ + time_draw_keyframes(C, stime, ar); + /* markers */ UI_view2d_view_orthoSpecial(ar, v2d, 1); draw_markers_time(C, 0); -- cgit v1.2.3