diff options
author | Rémi Verschelde <remi@verschelde.fr> | 2022-11-25 19:29:57 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-25 19:29:57 +0100 |
commit | c7ceb94e372216b1b033d7c2ac26d5b7545c4dac (patch) | |
tree | 225892b616946f95ea6d3f1aba8b31d97aff656e /modules/gdscript/gdscript_cache.cpp | |
parent | 47bd51e70be775294250a1b3a360d67d1d7cd04e (diff) | |
parent | 69bb7e5b1199e6af3256fe948dbfa3102c1ccbc8 (diff) | |
download | redot-engine-c7ceb94e372216b1b033d7c2ac26d5b7545c4dac.tar.gz |
Merge pull request #69079 from adamscott/fix-singleton-scene-cyclic-load
Fix singleton scene cyclic loading
Diffstat (limited to 'modules/gdscript/gdscript_cache.cpp')
-rw-r--r-- | modules/gdscript/gdscript_cache.cpp | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/modules/gdscript/gdscript_cache.cpp b/modules/gdscript/gdscript_cache.cpp index f35318e4c6..2e7263b652 100644 --- a/modules/gdscript/gdscript_cache.cpp +++ b/modules/gdscript/gdscript_cache.cpp @@ -365,31 +365,6 @@ Ref<PackedScene> GDScriptCache::get_packed_scene(const String &p_path, Error &r_ return scene; } -Ref<GDScript> GDScriptCache::get_packed_scene_script(const String &p_path, Error &r_error) { - r_error = OK; - Ref<PackedScene> scene = get_packed_scene(p_path, r_error); - - if (r_error != OK) { - return Ref<GDScript>(); - } - - int node_count = scene->get_state()->get_node_count(); - if (node_count == 0) { - return Ref<GDScript>(); - } - - const int ROOT_NODE = 0; - for (int i = 0; i < scene->get_state()->get_node_property_count(ROOT_NODE); i++) { - if (scene->get_state()->get_node_property_name(ROOT_NODE, i) != SNAME("script")) { - continue; - } - - return scene->get_state()->get_node_property_value(ROOT_NODE, i); - } - - return Ref<GDScript>(); -} - void GDScriptCache::clear_unreferenced_packed_scenes() { if (singleton == nullptr) { return; |