[Bf-blender-cvs] [9cd6ca299da] userpref_redesign: Minor refactor of enum item grouping logic

[Julian Eisel]

Commit: 9cd6ca299da85ae78e18d32b8f6fc484cb1bada6
Author: Julian Eisel
Date:   Sun Nov 25 16:21:35 2018 +0100
Branches: userpref_redesign
https://developer.blender.org/rB9cd6ca299da85ae78e18d32b8f6fc484cb1bada6

Minor refactor of enum item grouping logic

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

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 e5a301e2d02..8a27fd55d37 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -691,22 +691,23 @@ static void ui_item_enum_expand_exec(
 		const bool is_first = item == item_array;
 
 		if (!item->identifier[0]) {
-			if (item->name) {
-				if (!is_first) {
-					uiItemS(block->curlayout);
-				}
-				BLI_snprintf(group_name, sizeof(group_name), "%s:", item->name);
-				uiItemL(block->curlayout, group_name, item->icon);
-			}
-			else {
-				const EnumPropertyItem *next_item = item + 1;
-				if (next_item->identifier) {
-					if (radial && layout_radial) {
-						uiItemS(layout_radial);
-					}
-					else {
+			const EnumPropertyItem *next_item = item + 1;
+
+			/* Separate items, potentially with a label. */
+			if (next_item->identifier) {
+				/* Item without identifier but with name: Add group label for the following items. */
+				if (item->name) {
+					if (!is_first) {
 						uiItemS(block->curlayout);
 					}
+					BLI_snprintf(group_name, sizeof(group_name), "%s:", item->name);
+					uiItemL(block->curlayout, group_name, item->icon);
+				}
+				else if (radial && layout_radial) {
+					uiItemS(layout_radial);
+				}
+				else {
+					uiItemS(block->curlayout);
 				}
 			}
 			continue;