asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #56920 from pycbouh/docs-sort-class-properties

Browse source
This commit is contained in:
Rémi Verschelde 2022-01-18 23:17:23 +01:00 committed by GitHub
commit edfcdc1acb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
editor/doc_tools.cpp
View file

@ -350,7 +350,7 @@ void DocTools::generate(bool p_basic_types) {
List<PropertyInfo> properties; List<PropertyInfo> properties;
List<PropertyInfo> own_properties; List<PropertyInfo> own_properties;
if (name == "ProjectSettings") { 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); ProjectSettings::get_singleton()->get_property_list(&properties);
own_properties = properties; own_properties = properties;
} else { } else {
@ -358,9 +358,12 @@ void DocTools::generate(bool p_basic_types) {
ClassDB::get_property_list(name, &own_properties, true); ClassDB::get_property_list(name, &own_properties, true);
} }
properties.sort();
own_properties.sort();
List<PropertyInfo>::Element *EO = own_properties.front(); List<PropertyInfo>::Element *EO = own_properties.front();
for (const PropertyInfo &E : properties) { for (const PropertyInfo &E : properties) {
bool inherited = EO == nullptr; bool inherited = true;
if (EO && EO->get() == E) { if (EO && EO->get() == E) {
inherited = false; inherited = false;
EO = EO->next(); EO = EO->next();