diff options
author | Julian Eisel <julian@blender.org> | 2020-11-17 17:25:05 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2020-11-17 17:58:05 +0300 |
commit | 0724fabcf52ad9b97649969ab3c830b9fd5ac9ea (patch) | |
tree | 5dffd976b2bc8d71eb7898ca7bc8004dacb9e396 /source/blender/editors/interface | |
parent | dede4aac5be942d7619d29680a7534e536617946 (diff) |
Fix T81227: Modifier menu and text switch places
Logic was incorrect, mistake in f3b8792b963b.
Updated comment to make intent more clear.
Same as fd78f8699e03, but needed conflict resolution as the panel-type
flags where renamed in master.
Diffstat (limited to 'source/blender/editors/interface')
-rw-r--r-- | source/blender/editors/interface/interface_panel.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface_panel.c b/source/blender/editors/interface/interface_panel.c index bfe5dc223c8..e6e9f378349 100644 --- a/source/blender/editors/interface/interface_panel.c +++ b/source/blender/editors/interface/interface_panel.c @@ -1654,12 +1654,12 @@ static int find_highest_panel(const void *a, const void *b) /* Stick uppermost header-less panels to the top of the region - * prevent them from being sorted (multiple header-less panels have to be sorted though). */ if (panel_a->type->flag & PNL_NO_HEADER && panel_b->type->flag & PNL_NO_HEADER) { - /* Skip and check for `ofsy` and #Panel.sortorder below. */ + /* Pass the no-header checks and check for `ofsy` and #Panel.sortorder below. */ } - if (panel_a->type->flag & PNL_NO_HEADER) { + else if (panel_a->type->flag & PNL_NO_HEADER) { return -1; } - if (panel_b->type->flag & PNL_NO_HEADER) { + else if (panel_b->type->flag & PNL_NO_HEADER) { return 1; } |