[Bf-blender-cvs] [205202361c8] blender-v2.79-release: Fix width estimation for empty layouts in pie menus

Aleksandr Zinovev noreply at git.blender.org
Thu Aug 17 14:45:00 CEST 2017


Commit: 205202361c89b56f20b78a40c2c23e53fe423ac9
Author: Aleksandr Zinovev
Date:   Tue Aug 8 15:52:14 2017 +0300
Branches: blender-v2.79-release
https://developer.blender.org/rB205202361c89b56f20b78a40c2c23e53fe423ac9

Fix width estimation for empty layouts in pie menus

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

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 c57faf97188..dc2b97acf65 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -3137,8 +3137,11 @@ static void ui_item_estimate(uiItem *item)
 		for (subitem = litem->items.first; subitem; subitem = subitem->next)
 			ui_item_estimate(subitem);
 
-		if (BLI_listbase_is_empty(&litem->items))
+		if (BLI_listbase_is_empty(&litem->items)) {
+			litem->w = 0;
+			litem->h = 0;
 			return;
+		}
 
 		if (litem->scale[0] != 0.0f || litem->scale[1] != 0.0f)
 			ui_item_scale(litem, litem->scale);




More information about the Bf-blender-cvs mailing list