diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-02-13 11:10:53 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-02-13 11:10:53 +0300 |
commit | 34e9f6b9564b30a4d431d7c3cfa4821a9fe25690 (patch) | |
tree | 7d040e94988aaff85524f9dc6fee61f5991c867e /source/blender/editors/interface/interface_layout.c | |
parent | 616eb6818fdcf074eae31daa47c2ed581638b672 (diff) |
Fix (revert) mistake in rB1ae2098a6e04359b, causing broken UI (see e.g. Scene buttons).
Reported by sebastian_k through IRC, thanks!
Diffstat (limited to 'source/blender/editors/interface/interface_layout.c')
-rw-r--r-- | source/blender/editors/interface/interface_layout.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c index 7f50d7bf5b0..44c1ed474d5 100644 --- a/source/blender/editors/interface/interface_layout.c +++ b/source/blender/editors/interface/interface_layout.c @@ -217,7 +217,7 @@ static int ui_item_fit(int item, int pos, int all, int available, bool is_last, #define UI_ITEM_VARY_X 1 #define UI_ITEM_VARY_Y 2 -static bool ui_layout_vary_direction(uiLayout *layout) +static int ui_layout_vary_direction(uiLayout *layout) { return ((ELEM(layout->root->type, UI_LAYOUT_HEADER, UI_LAYOUT_PIEMENU) || (layout->alignment != UI_LAYOUT_ALIGN_EXPAND)) ? |