blender
/
blender
135
403
Fork 586
Code Issues 6.2k Pull Requests 758 Projects 19 Wiki Activity

WIP: Onion Skinning Prototype #107641

Closed
Christoph Lendenfeld wants to merge 22 commits from ChrisLend/blender:onion_skin_test into main
pull from: ChrisLend/blender:onion_skin_test
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 22 Files Changed 20 +14 -14
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 80a4e7b010 - Show all commits

28
source/blender/editors/animation/time_scrub_ui.c
View File

@ -122,20 +122,6 @@ static void draw_current_frame(const Scene *scene,
float outline_color[4];
UI_GetThemeColorShade4fv(TH_CFRAME, 5, outline_color);
UI_draw_roundbox_4fv_ex(
&(const rctf){
.xmin = frame_x - box_width / 2 + U.pixelsize / 2,
.xmax = frame_x + box_width / 2 + U.pixelsize / 2,
.ymin = scrub_region_rect->ymin + box_padding,
.ymax = scrub_region_rect->ymax - box_padding,
},
bg_color,
NULL,
1.0f,
outline_color,
U.pixelsize,
4 * UI_SCALE_FAC);
if (scene->onion_skin_cache.relative_left != 0) {
const int frame_relative_left = UI_view2d_view_to_region_x(
v2d, current_frame - scene->onion_skin_cache.relative_left);
@ -171,6 +157,20 @@ static void draw_current_frame(const Scene *scene,
4 * UI_SCALE_FAC);
}
UI_draw_roundbox_4fv_ex(
&(const rctf){
.xmin = frame_x - box_width / 2 + U.pixelsize / 2,
.xmax = frame_x + box_width / 2 + U.pixelsize / 2,
.ymin = scrub_region_rect->ymin + box_padding,
.ymax = scrub_region_rect->ymax - box_padding,
},
bg_color,
NULL,
1.0f,
outline_color,
U.pixelsize,
4 * UI_SCALE_FAC);
uchar text_color[4];
UI_GetThemeColor4ubv(TH_HEADER_TEXT_HI, text_color);
UI_fontstyle_draw_simple(fstyle,