From 4f0e0f16500bd91693bed666dd0d615bedd42c7c Mon Sep 17 00:00:00 2001
From: Yuri Rubinsky <chaosus89@gmail.com>
Date: Fri, 16 Sep 2022 08:56:59 +0300
Subject: Fix sorting of uniform items in the material properties

Co-authored-by: Chia-Hsiang Cheng <garychia@users.noreply.github.com>
---
 scene/resources/material.cpp | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

(limited to 'scene/resources/material.cpp')

diff --git a/scene/resources/material.cpp b/scene/resources/material.cpp
index e47bfef576..c1e30dd93c 100644
--- a/scene/resources/material.cpp
+++ b/scene/resources/material.cpp
@@ -257,23 +257,25 @@ void ShaderMaterial::_get_property_list(List<PropertyInfo> *p_list) const {
 			groups[last_group][last_subgroup].push_back(info);
 		}
 
-		// Sort groups alphabetically.
-		List<UniformProp> props;
+		List<String> group_names;
 		for (HashMap<String, HashMap<String, List<PropertyInfo>>>::Iterator group = groups.begin(); group; ++group) {
-			for (HashMap<String, List<PropertyInfo>>::Iterator subgroup = group->value.begin(); subgroup; ++subgroup) {
-				for (List<PropertyInfo>::Element *item = subgroup->value.front(); item; item = item->next()) {
-					if (subgroup->key == "<None>") {
-						props.push_back({ group->key, item->get() });
-					} else {
-						props.push_back({ group->key + "::" + subgroup->key, item->get() });
-					}
-				}
-			}
+			group_names.push_back(group->key);
 		}
-		props.sort_custom<UniformPropComparator>();
+		group_names.sort();
 
-		for (List<UniformProp>::Element *E = props.front(); E; E = E->next()) {
-			p_list->push_back(E->get().info);
+		for (const String &group_name : group_names) {
+			List<String> subgroup_names;
+			HashMap<String, List<PropertyInfo>> &subgroups = groups[group_name];
+			for (HashMap<String, List<PropertyInfo>>::Iterator subgroup = subgroups.begin(); subgroup; ++subgroup) {
+				subgroup_names.push_back(subgroup->key);
+			}
+			subgroup_names.sort();
+			for (const String &subgroup_name : subgroup_names) {
+				List<PropertyInfo> &prop_infos = subgroups[subgroup_name];
+				for (List<PropertyInfo>::Element *item = prop_infos.front(); item; item = item->next()) {
+					p_list->push_back(item->get());
+				}
+			}
 		}
 	}
 }
-- 
cgit v1.2.3