From 9b7b46143d2df7d4f2efcb89ceb5034c7a57e79c Mon Sep 17 00:00:00 2001 From: Leon Krause Date: Mon, 13 Nov 2017 21:46:57 +0100 Subject: Move singleton management from ProjectSettings to Engine --- modules/gdscript/gd_script.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'modules/gdscript/gd_script.cpp') diff --git a/modules/gdscript/gd_script.cpp b/modules/gdscript/gd_script.cpp index e5016c59bd..ba0353ae4a 100644 --- a/modules/gdscript/gd_script.cpp +++ b/modules/gdscript/gd_script.cpp @@ -29,6 +29,7 @@ /*************************************************************************/ #include "gd_script.h" +#include "engine.h" #include "gd_compiler.h" #include "global_constants.h" #include "io/file_access_encrypted.h" @@ -1347,9 +1348,9 @@ void GDScriptLanguage::init() { //populate singletons - List singletons; - ProjectSettings::get_singleton()->get_singletons(&singletons); - for (List::Element *E = singletons.front(); E; E = E->next()) { + List singletons; + Engine::get_singleton()->get_singletons(&singletons); + for (List::Element *E = singletons.front(); E; E = E->next()) { _add_global(E->get().name, E->get().ptr); } -- cgit v1.2.3