summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2022-01-18 23:17:23 +0100
committerGitHub <noreply@github.com>2022-01-18 23:17:23 +0100
commitedfcdc1acba9e95373f4634f2d9252a52ab87eba (patch)
treef8bfef196dede765d680e14b9cd84aa6e79f9040
parent4979d9fc7b0ecc68b8e98d2e98a6595be6bb8992 (diff)
parent49553ecfe31d521ac756ed0448996746defb97a6 (diff)
Merge pull request #56920 from pycbouh/docs-sort-class-properties
-rw-r--r--editor/doc_tools.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/editor/doc_tools.cpp b/editor/doc_tools.cpp
index 6804ec32ac..6acf654b04 100644
--- a/editor/doc_tools.cpp
+++ b/editor/doc_tools.cpp
@@ -350,7 +350,7 @@ void DocTools::generate(bool p_basic_types) {
List<PropertyInfo> properties;
List<PropertyInfo> own_properties;
if (name == "ProjectSettings") {
- //special case for project settings, so settings can be documented
+ // Special case for project settings, so settings can be documented.
ProjectSettings::get_singleton()->get_property_list(&properties);
own_properties = properties;
} else {
@@ -358,9 +358,12 @@ void DocTools::generate(bool p_basic_types) {
ClassDB::get_property_list(name, &own_properties, true);
}
+ properties.sort();
+ own_properties.sort();
+
List<PropertyInfo>::Element *EO = own_properties.front();
for (const PropertyInfo &E : properties) {
- bool inherited = EO == nullptr;
+ bool inherited = true;
if (EO && EO->get() == E) {
inherited = false;
EO = EO->next();