griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v5.0-release'

Browse Source
This commit is contained in:
Harley Acheson
2025-10-10 09:20:36 -07:00
parent 42263644c1 0262b939a0
commit 641a14d312
3 changed files with 50 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/editors/animation/time_scrub_ui.cc
View File

@@ -94,7 +94,7 @@ static void draw_current_frame(const Scene *scene,
const float box_width = std::max(text_width + (2.0f * text_padding), box_min_width);
const float box_margin = 2.0f * UI_SCALE_FAC;
const float shadow_width = UI_SCALE_FAC;
const float tri_top = floor(scrub_region_rect->ymin + box_margin);
const float tri_top = ceil(scrub_region_rect->ymin + box_margin);
const float tri_half_width = 6.0f * UI_SCALE_FAC;
const float tri_height = 6.0f * UI_SCALE_FAC;
rctf rect{};
@@ -123,8 +123,8 @@ static void draw_current_frame(const Scene *scene,
immUnbindProgram();
/* Vertical line. */
rect.xmin = floor(subframe_x - U.pixelsize - shadow_width);
rect.xmax = floor(subframe_x + U.pixelsize + 1.0f + shadow_width);
rect.xmin = floor(subframe_x - U.pixelsize) - shadow_width;
rect.xmax = floor(subframe_x + U.pixelsize + 1.0f) + shadow_width;
rect.ymin = 0.0f;
rect.ymax = ceil(scrub_region_rect->ymax - box_margin + shadow_width);
UI_draw_roundbox_4fv_ex(&rect, fg_color, nullptr, 1.0f, bg_color, shadow_width, 0.0f);