summaryrefslogtreecommitdiff
path: root/tools/doc
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2017-01-05 09:16:00 -0300
committerJuan Linietsky <reduzio@gmail.com>2017-01-05 09:16:00 -0300
commit0f7af4ea51744cda23c4d3c7481f9c332973d1d4 (patch)
tree27b8914062558b5648655ccf3db13251d217af98 /tools/doc
parent9e477babb3bf0ce5179395c2a5155a3f3cd36798 (diff)
-Changed most project settings in the engine, so they have major and minor categories.
-Changed SectionedPropertyEditor to support this -Renamed Globals singleton to GlobalConfig, makes more sense. -Changed the logic behind persisten global settings, instead of the persist checkbox, a revert button is now available
Diffstat (limited to 'tools/doc')
-rw-r--r--tools/doc/doc_data.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/doc/doc_data.cpp b/tools/doc/doc_data.cpp
index 10d4b6461d..f66a8aff22 100644
--- a/tools/doc/doc_data.cpp
+++ b/tools/doc/doc_data.cpp
@@ -608,14 +608,14 @@ void DocData::generate(bool p_basic_types) {
c.constants.push_back(cd);
}
- List<Globals::Singleton> singletons;
- Globals::get_singleton()->get_singletons(&singletons);
+ List<GlobalConfig::Singleton> singletons;
+ GlobalConfig::get_singleton()->get_singletons(&singletons);
//servers (this is kind of hackish)
- for(List<Globals::Singleton>::Element *E=singletons.front();E;E=E->next()) {
+ for(List<GlobalConfig::Singleton>::Element *E=singletons.front();E;E=E->next()) {
PropertyDoc pd;
- Globals::Singleton &s=E->get();
+ GlobalConfig::Singleton &s=E->get();
pd.name=s.name;
pd.type=s.ptr->get_class();
while (String(ClassDB::get_parent_class(pd.type))!="Object")