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

Merge remote-tracking branch 'origin/blender-v4.2-release'

Browse Source
This commit is contained in:
Sybren A. Stüvel
2024-07-09 18:11:21 +02:00
parent 509cb361bb 63cb33139f
commit c26dc45bd9
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/editors/space_action/space_action.cc
View File

@@ -285,9 +285,6 @@ static void action_channel_region_draw(const bContext *C, ARegion *region)
/* clear and setup matrix */
UI_ThemeClearColor(TH_BACK);
/* channel filter next to scrubbing area */
ED_time_scrub_channel_search_draw(C, region, ac.ads);
if (!has_valid_animcontext) {
return;
}
@@ -307,6 +304,9 @@ static void action_channel_region_draw(const bContext *C, ARegion *region)
UI_view2d_view_ortho(v2d);
draw_channel_names((bContext *)C, &ac, region, anim_data);
/* channel filter next to scrubbing area */
ED_time_scrub_channel_search_draw(C, region, ac.ads);
/* reset view matrix */
UI_view2d_view_restore(C);