[Bf-blender-cvs] [fd78f8699e0] master: Fix T81227: Modifier menu and text switch places

[Julian Eisel]

Commit: fd78f8699e034d52d5d0921a7b4c722f68b213cc
Author: Julian Eisel
Date:   Tue Nov 17 15:25:05 2020 +0100
Branches: master
https://developer.blender.org/rBfd78f8699e034d52d5d0921a7b4c722f68b213cc

Fix T81227: Modifier menu and text switch places

Logic was incorrect, mistake in f3b8792b963b.

Updated comment to make intent more clear.

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

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 aafc1c53a3b..6b6d9a76313 100644
--- a/source/blender/editors/interface/interface_panel.c
+++ b/source/blender/editors/interface/interface_panel.c
@@ -1634,12 +1634,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 & PANEL_TYPE_NO_HEADER && panel_b->type->flag & PANEL_TYPE_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 & PANEL_TYPE_NO_HEADER) {
+  else if (panel_a->type->flag & PANEL_TYPE_NO_HEADER) {
     return -1;
   }
-  if (panel_b->type->flag & PANEL_TYPE_NO_HEADER) {
+  else if (panel_b->type->flag & PANEL_TYPE_NO_HEADER) {
     return 1;
   }