noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #104014 from precup/relative_path_fix

Browse Source 
Account for relative extends paths in a GDScript utility function
This commit is contained in:
Thaddeus Crews
2026-06-18 15:14:18 -05:00
parent f6260eb8fc b7e3c64766
commit 685c3eedb7
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/gdscript/gdscript.cpp
+6 -6
View File
@@ -2758,15 +2758,19 @@ String GDScriptLanguage::_get_global_class_name(const String &p_path, String *r_
while (subclass) {
if (subclass->extends_used) {
if (!subclass->extends_path.is_empty()) {
String subpath = subclass->extends_path;
if (subpath.is_relative_path()) {
subpath = path.get_base_dir().path_join(subpath).simplify_path();
}
if (subclass->extends.is_empty()) {
// We only care about the referenced class_name.
_ALLOW_DISCARD_ _get_global_class_name(subclass->extends_path, r_base_type, nullptr, nullptr, nullptr, r_visited);
_ALLOW_DISCARD_ _get_global_class_name(subpath, r_base_type, nullptr, nullptr, nullptr, r_visited);
subclass = nullptr;
break;
} else {
Vector<GDScriptParser::IdentifierNode *> extend_classes = subclass->extends;
Ref<FileAccess> subfile = FileAccess::open(subclass->extends_path, FileAccess::READ);
Ref<FileAccess> subfile = FileAccess::open(subpath, FileAccess::READ);
if (subfile.is_null()) {
break;
}
@@ -2775,10 +2779,6 @@ String GDScriptLanguage::_get_global_class_name(const String &p_path, String *r_
if (subsource.is_empty()) {
break;
}
String subpath = subclass->extends_path;
if (subpath.is_relative_path()) {
subpath = path.get_base_dir().path_join(subpath).simplify_path();
}
if (OK != subparser.parse(subsource, subpath, false)) {
break;