diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-03-09 14:27:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-09 14:27:43 +0100 |
| commit | 0d728123c674a1ccbbf60707a65016f9c71c3731 (patch) | |
| tree | 7087d16915b6a5b93b9dfb08b7764db8fbe9d9e1 /core/io/resource_loader.cpp | |
| parent | 9d36ce25e81c6d19e82e87a0468578b12b6b4be8 (diff) | |
| parent | 25f9aee00565996eae4c1cd011c9573a7e37922c (diff) | |
Merge pull request #26818 from vnen/class_name-inheritance
Allow class_name scripts to have nested inheritance
Diffstat (limited to 'core/io/resource_loader.cpp')
| -rw-r--r-- | core/io/resource_loader.cpp | 2 |
1 files changed, 1 insertions, 1 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); |