|
@@ -3465,7 +3465,7 @@ void GDScriptAnalyzer::reduce_identifier_from_base_set_class(GDScriptParser::Ide
|
|
|
|
|
|
p_identifier->set_datatype(p_identifier_datatype);
|
|
p_identifier->set_datatype(p_identifier_datatype);
|
|
Error err = OK;
|
|
Error err = OK;
|
|
- Ref<GDScript> scr = GDScriptCache::get_shallow_script(p_identifier_datatype.script_path, err);
|
|
|
|
|
|
+ Ref<GDScript> scr = GDScriptCache::get_shallow_script(p_identifier_datatype.script_path, err, parser->script_path);
|
|
if (err) {
|
|
if (err) {
|
|
push_error(vformat(R"(Error while getting cache for script "%s".)", p_identifier_datatype.script_path), p_identifier);
|
|
push_error(vformat(R"(Error while getting cache for script "%s".)", p_identifier_datatype.script_path), p_identifier);
|
|
return;
|
|
return;
|
|
@@ -4589,7 +4589,7 @@ Array GDScriptAnalyzer::make_array_from_element_datatype(const GDScriptParser::D
|
|
Ref<Script> script_type = p_element_datatype.script_type;
|
|
Ref<Script> script_type = p_element_datatype.script_type;
|
|
if (p_element_datatype.kind == GDScriptParser::DataType::CLASS && script_type.is_null()) {
|
|
if (p_element_datatype.kind == GDScriptParser::DataType::CLASS && script_type.is_null()) {
|
|
Error err = OK;
|
|
Error err = OK;
|
|
- Ref<GDScript> scr = GDScriptCache::get_shallow_script(p_element_datatype.script_path, err);
|
|
|
|
|
|
+ Ref<GDScript> scr = GDScriptCache::get_shallow_script(p_element_datatype.script_path, err, parser->script_path);
|
|
if (err) {
|
|
if (err) {
|
|
push_error(vformat(R"(Error while getting cache for script "%s".)", p_element_datatype.script_path), p_source_node);
|
|
push_error(vformat(R"(Error while getting cache for script "%s".)", p_element_datatype.script_path), p_source_node);
|
|
return array;
|
|
return array;
|