[Bf-blender-cvs] [44d6c68] master: Fix for Layout.operator_enum ignoring alignment

Campbell Barton noreply at git.blender.org
Wed Mar 19 15:34:35 CET 2014


Commit: 44d6c686fa57639007997f18d4abb9dace22cc08
Author: Campbell Barton
Date:   Thu Mar 20 01:15:34 2014 +1100
https://developer.blender.org/rB44d6c686fa57639007997f18d4abb9dace22cc08

Fix for Layout.operator_enum ignoring alignment

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

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 0ba47eb..fa56dc1 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -888,7 +888,7 @@ void uiItemsFullEnumO(uiLayout *layout, const char *opname, const char *propname
 		EnumPropertyItem *item, *item_array = NULL;
 		bool free;
 		uiLayout *split = uiLayoutSplit(layout, 0.0f, false);
-		uiLayout *column = uiLayoutColumn(split, false);
+		uiLayout *column = uiLayoutColumn(split, layout->align);
 
 		RNA_property_enum_items_gettexted(block->evil_C, &ptr, prop, &item_array, NULL, &free);
 		for (item = item_array; item->identifier; item++) {
@@ -912,7 +912,7 @@ void uiItemsFullEnumO(uiLayout *layout, const char *opname, const char *propname
 				if (item->name) {
 					uiBut *but;
 					if (item != item_array) {
-						column = uiLayoutColumn(split, false);
+						column = uiLayoutColumn(split, layout->align);
 						/* inconsistent, but menus with labels do not look good flipped */
 						block->flag |= UI_BLOCK_NO_FLIP;
 					}




More information about the Bf-blender-cvs mailing list