diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2020-05-26 17:26:16 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2020-05-26 17:26:16 +0300 |
| commit | d8733539b70a1f1f0cec8650ff6057c8ef0f3ae6 (patch) | |
| tree | 91da8f2bb2d88b4829ee283c74caec77396d1147 /source/blender/editors/interface | |
| parent | 14b1c55e110123046f3fc98d1d5458a8ab2225c7 (diff) | |
| parent | f3cf29ac96937bec76e6cfeb6b143625a814bc03 (diff) | |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender/editors/interface')
| -rw-r--r-- | source/blender/editors/interface/interface_align.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_align.c b/source/blender/editors/interface/interface_align.c index 09811fab52d..acbdf564054 100644 --- a/source/blender/editors/interface/interface_align.c +++ b/source/blender/editors/interface/interface_align.c @@ -124,7 +124,11 @@ bool ui_but_can_align(const uiBut *but) int ui_but_align_opposite_to_area_align_get(const ARegion *region) { - switch (RGN_ALIGN_ENUM_FROM_MASK(region->alignment)) { + const ARegion *align_region = (region->alignment & RGN_SPLIT_PREV && region->prev) ? + region->prev : + region; + + switch (RGN_ALIGN_ENUM_FROM_MASK(align_region->alignment)) { case RGN_ALIGN_TOP: return UI_BUT_ALIGN_DOWN; case RGN_ALIGN_BOTTOM: |