diff options
| author | George Marques <george@gmarqu.es> | 2019-03-09 00:47:27 -0300 |
|---|---|---|
| committer | George Marques <george@gmarqu.es> | 2019-03-09 00:47:27 -0300 |
| commit | 25f9aee00565996eae4c1cd011c9573a7e37922c (patch) | |
| tree | 8bc4c7ecfec8e0df37f1a387dd3c329d443bd7bb /core/io | |
| parent | a38bf5287a02238581359b548aef3170cd577a5f (diff) | |
Allow class_name scripts to have nested inheritance
Diffstat (limited to 'core/io')
| -rw-r--r-- | core/io/resource_loader.cpp | 2 | ||||
| -rw-r--r-- | core/io/resource_saver.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/io/resource_loader.cpp b/core/io/resource_loader.cpp index c917b9ba28..e4b694b64f 100644 --- a/core/io/resource_loader.cpp +++ b/core/io/resource_loader.cpp @@ -946,7 +946,7 @@ void ResourceLoader::add_custom_loaders() { for (List<StringName>::Element *E = global_classes.front(); E; E = E->next()) { StringName class_name = E->get(); - StringName base_class = ScriptServer::get_global_class_base(class_name); + StringName base_class = ScriptServer::get_global_class_native_base(class_name); if (base_class == custom_loader_base_class) { String path = ScriptServer::get_global_class_path(class_name); diff --git a/core/io/resource_saver.cpp b/core/io/resource_saver.cpp index c992e2bf94..0cecca904d 100644 --- a/core/io/resource_saver.cpp +++ b/core/io/resource_saver.cpp @@ -249,7 +249,7 @@ void ResourceSaver::add_custom_savers() { for (List<StringName>::Element *E = global_classes.front(); E; E = E->next()) { StringName class_name = E->get(); - StringName base_class = ScriptServer::get_global_class_base(class_name); + StringName base_class = ScriptServer::get_global_class_native_base(class_name); if (base_class == custom_saver_base_class) { String path = ScriptServer::get_global_class_path(class_name); |