[Bf-blender-cvs] [62aa103d485] master: Fix for T78191: Timeline lines changing thickness
Harley Acheson
noreply at git.blender.org
Fri Jun 26 00:08:59 CEST 2020
Commit: 62aa103d485fd6e0b15100c1928695c4fb3ce039
Author: Harley Acheson
Date: Thu Jun 25 14:53:59 2020 -0700
Branches: master
https://developer.blender.org/rB62aa103d485fd6e0b15100c1928695c4fb3ce039
Fix for T78191: Timeline lines changing thickness
Fixes issue where lines in timeline are sometimes double-width when hovering in area.
Differential Revision: https://developer.blender.org/D8116
Reviewed by Brecht Van Lommel
===================================================================
M source/blender/editors/animation/time_scrub_ui.c
===================================================================
diff --git a/source/blender/editors/animation/time_scrub_ui.c b/source/blender/editors/animation/time_scrub_ui.c
index f4ed2add624..edc36326c57 100644
--- a/source/blender/editors/animation/time_scrub_ui.c
+++ b/source/blender/editors/animation/time_scrub_ui.c
@@ -112,16 +112,15 @@ static void draw_current_frame(const Scene *scene,
/* 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, current_frame + sub_frame);
- GPU_line_width(2.0f);
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);
- immBegin(GPU_PRIM_LINES, 2);
-
- immVertex2f(pos, subframe_x, scrub_region_rect->ymax - box_padding);
- immVertex2f(pos, subframe_x, 0.0f);
- immEnd();
+ immRectf(pos,
+ subframe_x - U.pixelsize,
+ scrub_region_rect->ymax - box_padding,
+ subframe_x + U.pixelsize,
+ 0.0f);
immUnbindProgram();
}
More information about the Bf-blender-cvs
mailing list