[Bf-blender-cvs] [4beb3c92dfb] soc-2020-outliner: Merge branch 'master' into soc-2020-outliner

[Nathan Craddock]

Commit: 4beb3c92dfb3cc977d12eea53e117b657c03d844
Author: Nathan Craddock
Date:   Tue Aug 18 20:46:46 2020 -0600
Branches: soc-2020-outliner
https://developer.blender.org/rB4beb3c92dfb3cc977d12eea53e117b657c03d844

Merge branch 'master' into soc-2020-outliner

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



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

diff --cc source/blender/editors/interface/interface_layout.c
index 4e928c62bde,ad76466b67c..f19596c7ba7
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@@ -3744,19 -3718,18 +3741,18 @@@ static void ui_litem_estimate_column(ui
    }
  }
  
 -static void ui_litem_layout_column(uiLayout *litem, bool is_box)
 +static void ui_litem_layout_column(uiLayout *litem, bool is_box, bool is_menu)
  {
-   uiItem *item;
 -  int itemh, x, y;
 +  int itemw, itemh, x, y;
  
    x = litem->x;
    y = litem->y;
  
-   for (item = litem->items.first; item; item = item->next) {
+   LISTBASE_FOREACH (uiItem *, item, &litem->items) {
 -    ui_item_size(item, NULL, &itemh);
 +    ui_item_size(item, &itemw, &itemh);
  
      y -= itemh;
 -    ui_item_position(item, x, y, litem->w, itemh);
 +    ui_item_position(item, x, y, is_menu ? itemw : litem->w, itemh);
  
      if (item->next && (!is_box || item != litem->items.first)) {
        y -= litem->space;