blender
/
blender
136
406
Fork 588
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

Anim: Marker Drawing Changes #115252

Merged
Harley Acheson merged 1 commits from Harley/blender:Markers into main 2023-11-24 19:19:41 +01:00
Conversation 1 Commits 1 Files Changed 1 +19 -2
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
source/blender/editors/animation/anim_markers.cc
View File

@ -478,10 +478,27 @@ static void draw_marker(const uiFontStyle *fstyle,
GPU_blend(GPU_BLEND_ALPHA);
draw_marker_line(line_color, xpos, UI_SCALE_FAC * 20, region_height);
draw_marker_line(line_color, xpos, UI_SCALE_FAC * 28, region_height);
int icon_id = marker_get_icon_id(marker, flag);
UI_icon_draw(xpos - 0.55f * UI_ICON_SIZE, UI_SCALE_FAC * 18, icon_id);
uchar marker_color[4];
if (marker->flag & SELECT) {
UI_GetThemeColor4ubv(TH_TIME_MARKER_LINE_SELECTED, marker_color);
}
else {
UI_GetThemeColor4ubv(TH_TEXT, marker_color);
}
UI_icon_draw_ex(xpos - (0.5f * UI_ICON_SIZE) - (0.5f * U.pixelsize),
UI_SCALE_FAC * 18,
icon_id,
UI_INV_SCALE_FAC,
1.0f,
0.0f,
marker_color,
false,
UI_NO_ICON_OVERLAY_TEXT);
GPU_blend(GPU_BLEND_NONE);