Commit: 34e9f6b9564b30a4d431d7c3cfa4821a9fe25690
Author: Bastien Montagne
Date: Fri Feb 13 09:10:53 2015 +0100
Branches: master
https://developer.blender.org/rB34e9f6b9564b30a4d431d7c3cfa4821a9fe25690
Fix (revert) mistake in rB1ae2098a6e04359b, causing broken UI (see e.g. Scene
buttons).
Reported by sebastian_k through IRC, thanks!
===================================================================
M source/blender/editors/interface/interface_layout.c
===================================================================
diff --git a/source/blender/editors/interface/interface_layout.c
b/source/blender/editors/interface/interface_layout.c
index 7f50d7b..44c1ed4 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)) ?
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
