godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #23060 from willnationsdev/inherit-non-class-script 

Fix Script -> Script Class not in CreateDialog
This commit is contained in:
Rémi Verschelde 2018-11-26 10:52:52 +01:00 committed by GitHub
parent 9f50cbc6ed 372f82e7a7
commit af92b7dc14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
editor/editor_data.cpp
View File

@ -857,11 +857,16 @@ bool EditorData::script_class_is_parent(const String &p_class, const String &p_i
if (!ScriptServer::is_global_class(p_class))
return false;
String base = script_class_get_base(p_class);
Ref<Script> script = ResourceLoader::load(ScriptServer::get_global_class_path(p_class), "Script");
Ref<Script> base_script = script->get_base_script();
while (p_inherits != base) {
if (ClassDB::class_exists(base)) {
return ClassDB::is_parent_class(base, p_inherits);
} else if (ScriptServer::is_global_class(base)) {
base = script_class_get_base(base);
} else if (base_script.is_valid()) {
return ClassDB::is_parent_class(base_script->get_instance_base_type(), p_inherits);
} else {
return false;
}