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

Merge pull request #55477 from pycbouh/editor-crash-script-parent-check

This commit is contained in:
Rémi Verschelde 2021-11-30 17:03:14 +01:00 committed by GitHub
parent 2a702cff41 98ad5cd3db
commit 2f8cb1547c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
editor/editor_data.cpp
View File

@ -893,8 +893,13 @@ bool EditorData::script_class_is_parent(const String &p_class, const String &p_i
if (!ScriptServer::is_global_class(p_class)) { if (!ScriptServer::is_global_class(p_class)) {
return false; return false;
} }
String base = script_class_get_base(p_class);
Ref<Script> script = script_class_load_script(p_class); Ref<Script> script = script_class_load_script(p_class);
if (script.is_null()) {
return false;
}
String base = script_class_get_base(p_class);
Ref<Script> base_script = script->get_base_script(); Ref<Script> base_script = script->get_base_script();
while (p_inherits != base) { while (p_inherits != base) {