summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorAndreas Haas <Hinsbart@users.noreply.github.com>2017-10-02 23:51:26 +0200
committerGitHub <noreply@github.com>2017-10-02 23:51:26 +0200
commit132ba0ed9799db9ed1449fa2f2fc597d4b91612d (patch)
treeb0c62cdc864e64636fa6717438025fbd9a35fb04 /main
parentde9cc6ed96c79c70ca9cf22830b3e42cca4f244b (diff)
parent1a2311e3505765e37b736fe6bb46bb229e00701f (diff)
Merge pull request #11568 from endragor/loggers
Extract logging logic
Diffstat (limited to 'main')
-rw-r--r--main/main.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/main/main.cpp b/main/main.cpp
index f9422cdf0b..48df37ac63 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -231,7 +231,6 @@ void Main::print_help(const char *p_binary) {
}
Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_phase) {
-
RID_OwnerBase::init_rid();
OS::get_singleton()->initialize_core();
@@ -254,6 +253,8 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
register_core_settings(); //here globals is present
+ OS::get_singleton()->initialize_logger();
+
translation_server = memnew(TranslationServer);
performance = memnew(Performance);
globals->add_singleton(ProjectSettings::Singleton("Performance", performance));