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

Merge branch 'blender-v4.0-release'

Browse Source
This commit is contained in:
Julian Eisel
2023-09-27 19:56:07 +02:00
parent db9ad9f139 5017767e11
commit 77e60a4eb6
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/editors/space_image/space_image.cc
View File

@@ -950,7 +950,12 @@ static void image_tools_header_region_draw(const bContext *C, ARegion *region)
image_user_refresh_scene(C, sima);
ED_region_header_with_button_sections(C, region, uiButtonSectionsAlign::Top);
ED_region_header_with_button_sections(
C,
region,
(RGN_ALIGN_ENUM_FROM_MASK(region->alignment) == RGN_ALIGN_TOP) ?
uiButtonSectionsAlign::Top :
uiButtonSectionsAlign::Bottom);
}
/************************* header region **************************/

7
source/blender/editors/space_view3d/space_view3d.cc
View File

@@ -1967,7 +1967,12 @@ static void view3d_tools_region_draw(const bContext *C, ARegion *region)
static void view3d_tools_header_region_draw(const bContext *C, ARegion *region)
{
ED_region_header_with_button_sections(C, region, uiButtonSectionsAlign::Top);
ED_region_header_with_button_sections(
C,
region,
(RGN_ALIGN_ENUM_FROM_MASK(region->alignment) == RGN_ALIGN_TOP) ?
uiButtonSectionsAlign::Top :
uiButtonSectionsAlign::Bottom);
}
/* add handlers, stuff you only do once or on area/region changes */