[Bf-blender-cvs] [0724fabcf52] blender-v2.91-release: Fix T81227: Modifier menu and text switch places

[Julian Eisel]

Commit: 0724fabcf52ad9b97649969ab3c830b9fd5ac9ea
Author: Julian Eisel
Date:   Tue Nov 17 15:25:05 2020 +0100
Branches: blender-v2.91-release
https://developer.blender.org/rB0724fabcf52ad9b97649969ab3c830b9fd5ac9ea

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.

===================================================================

M	source/blender/editors/interface/interface_panel.c

===================================================================

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;
   }