[Bf-blender-cvs] [89980fd] temp_pie_max_items_fix: Fix op-enums with exactly 8 items adding unnecessary pie level

Julian Eisel noreply at git.blender.org
Mon Feb 15 17:10:10 CET 2016


Commit: 89980fdc4be24384800f2439a304cb6d536946e0
Author: Julian Eisel
Date:   Mon Feb 15 17:08:08 2016 +0100
Branches: temp_pie_max_items_fix
https://developer.blender.org/rB89980fdc4be24384800f2439a304cb6d536946e0

Fix op-enums with exactly 8 items adding unnecessary pie level

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

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 90adcc7..976f783 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -934,7 +934,7 @@ void uiItemsFullEnumO_array(
 
 	for (i = 1, item = item_array; item->identifier; i++, item++) {
 		/* handle oversized pies */
-		if (radial && i >= PIE_MAX_ITEMS) {
+		if (radial && (totitem > PIE_MAX_ITEMS) && (i >= PIE_MAX_ITEMS)) {
 			/* only create a new pie level if there's a visible item for it */
 			if (item->name) {
 				ui_pie_menu_level_create(block, ot, propname, properties, item_array, totitem, context, flag);




More information about the Bf-blender-cvs mailing list