[Bf-blender-cvs] [723f6e7f534] property-search-ui: Merge branch 'master' into property-search-ui

[Hans Goudey]

Commit: 723f6e7f5348c021bcd94cb78a8a751dcf81fa20
Author: Hans Goudey
Date:   Tue Jun 16 10:50:35 2020 -0400
Branches: property-search-ui
https://developer.blender.org/rB723f6e7f5348c021bcd94cb78a8a751dcf81fa20

Merge branch 'master' into property-search-ui

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



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

diff --cc source/blender/editors/interface/interface_panel.c
index ec77453b527,55657d7297a..950f94b9bf8
--- a/source/blender/editors/interface/interface_panel.c
+++ b/source/blender/editors/interface/interface_panel.c
@@@ -1464,10 -1412,9 +1466,10 @@@ static bool uiAlignPanelStep(ScrArea *a
    if (tot == 0) {
      return 0;
    }
 +  // printf("Aligning %d panels, factor = %.2f\n", tot, fac);
  
    /* extra; change close direction? */
-   for (panel = region->panels.first; panel; panel = panel->next) {
+   LISTBASE_FOREACH (Panel *, panel, &region->panels) {
      if (panel->runtime_flag & PNL_ACTIVE) {
        if ((panel->flag & PNL_CLOSEDX) && (align == BUT_VERTICAL)) {
          panel->flag ^= PNL_CLOSED;
@@@ -1722,16 -1665,14 +1720,16 @@@ void UI_panels_draw(const bContext *C, 
    /* Draw panels, selected on top. Also in reverse order, because
     * UI blocks are added in reverse order and we need child panels
     * to draw on top. */
-   for (block = region->uiblocks.last; block; block = block->prev) {
+   LISTBASE_FOREACH_BACKWARD (uiBlock *, block, &region->uiblocks) {
 -    if (block->active && block->panel && !(block->panel->flag & PNL_SELECT)) {
 +    if (block->active && block->panel && !(block->panel->flag & PNL_SELECT) &&
 +        !(block->flag & UI_BLOCK_FILTERED_EMPTY)) {
        UI_block_draw(C, block);
      }
    }
  
-   for (block = region->uiblocks.last; block; block = block->prev) {
+   LISTBASE_FOREACH_BACKWARD (uiBlock *, block, &region->uiblocks) {
 -    if (block->active && block->panel && (block->panel->flag & PNL_SELECT)) {
 +    if (block->active && block->panel && (block->panel->flag & PNL_SELECT) &&
 +        !(block->flag & UI_BLOCK_FILTERED_EMPTY)) {
        UI_block_draw(C, block);
      }
    }