summaryrefslogtreecommitdiffstats
path: root/core/script_language.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2019-03-09 14:27:43 +0100
committerGitHub <noreply@github.com>2019-03-09 14:27:43 +0100
commit0d728123c674a1ccbbf60707a65016f9c71c3731 (patch)
tree7087d16915b6a5b93b9dfb08b7764db8fbe9d9e1 /core/script_language.cpp
parent9d36ce25e81c6d19e82e87a0468578b12b6b4be8 (diff)
parent25f9aee00565996eae4c1cd011c9573a7e37922c (diff)
downloadredot-engine-0d728123c674a1ccbbf60707a65016f9c71c3731.tar.gz
Merge pull request #26818 from vnen/class_name-inheritance
Allow class_name scripts to have nested inheritance
Diffstat (limited to 'core/script_language.cpp')
-rw-r--r--core/script_language.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/core/script_language.cpp b/core/script_language.cpp
index 1c244661b0..4a6f904f9d 100644
--- a/core/script_language.cpp
+++ b/core/script_language.cpp
@@ -190,6 +190,14 @@ StringName ScriptServer::get_global_class_base(const String &p_class) {
ERR_FAIL_COND_V(!global_classes.has(p_class), String());
return global_classes[p_class].base;
}
+StringName ScriptServer::get_global_class_native_base(const String &p_class) {
+ ERR_FAIL_COND_V(!global_classes.has(p_class), String());
+ String base = global_classes[p_class].base;
+ while (global_classes.has(base)) {
+ base = global_classes[base].base;
+ }
+ return base;
+}
void ScriptServer::get_global_class_list(List<StringName> *r_global_classes) {
const StringName *K = NULL;
List<StringName> classes;