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:
Diffstat (limited to 'source/blender/editors/animation/time_scrub_ui.c')
-rw-r--r--source/blender/editors/animation/time_scrub_ui.c36
1 files changed, 16 insertions, 20 deletions
diff --git a/source/blender/editors/animation/time_scrub_ui.c b/source/blender/editors/animation/time_scrub_ui.c
index 8aeb6a57124..70a8973864c 100644
--- a/source/blender/editors/animation/time_scrub_ui.c
+++ b/source/blender/editors/animation/time_scrub_ui.c
@@ -91,8 +91,7 @@ static void draw_current_frame(const Scene *scene,
bool display_seconds,
const View2D *v2d,
const rcti *scrub_region_rect,
- int current_frame,
- bool draw_line)
+ int current_frame)
{
const uiFontStyle *fstyle = UI_FSTYLE_WIDGET;
int frame_x = UI_view2d_view_to_region_x(v2d, current_frame);
@@ -106,21 +105,19 @@ static void draw_current_frame(const Scene *scene,
float bg_color[4];
UI_GetThemeColorShade4fv(TH_CFRAME, -5, bg_color);
- if (draw_line) {
- /* Draw vertical line to from the bottom of the current frame box to the bottom of the screen.
- */
- const float subframe_x = UI_view2d_view_to_region_x(v2d, BKE_scene_ctime_get(scene));
- GPUVertFormat *format = immVertexFormat();
- uint pos = GPU_vertformat_attr_add(format, "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
- immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
- immUniformThemeColor(TH_CFRAME);
- immRectf(pos,
- subframe_x - U.pixelsize,
- scrub_region_rect->ymax - box_padding,
- subframe_x + U.pixelsize,
- 0.0f);
- immUnbindProgram();
- }
+ /* Draw vertical line to from the bottom of the current frame box to the bottom of the screen.
+ */
+ const float subframe_x = UI_view2d_view_to_region_x(v2d, BKE_scene_ctime_get(scene));
+ GPUVertFormat *format = immVertexFormat();
+ uint pos = GPU_vertformat_attr_add(format, "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
+ immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+ immUniformThemeColor(TH_CFRAME);
+ immRectf(pos,
+ subframe_x - U.pixelsize,
+ scrub_region_rect->ymax - box_padding,
+ subframe_x + U.pixelsize,
+ 0.0f);
+ immUnbindProgram();
UI_draw_roundbox_corner_set(UI_CNR_ALL);
@@ -152,8 +149,7 @@ static void draw_current_frame(const Scene *scene,
void ED_time_scrub_draw_current_frame(const ARegion *region,
const Scene *scene,
- bool display_seconds,
- bool draw_line)
+ bool display_seconds)
{
const View2D *v2d = &region->v2d;
GPU_matrix_push_projection();
@@ -162,7 +158,7 @@ void ED_time_scrub_draw_current_frame(const ARegion *region,
rcti scrub_region_rect;
get_time_scrub_region_rect(region, &scrub_region_rect);
- draw_current_frame(scene, display_seconds, v2d, &scrub_region_rect, scene->r.cfra, draw_line);
+ draw_current_frame(scene, display_seconds, v2d, &scrub_region_rect, scene->r.cfra);
GPU_matrix_pop_projection();
}