summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2019-03-04 10:17:52 +0100
committerGitHub <noreply@github.com>2019-03-04 10:17:52 +0100
commit31206ca4e98d55767f73416a4ce1b915be4c928e (patch)
treec771278f994291cc729b0529052b30d9419f0ca3
parentb811207406b3359f3e63eda3f35a0d624e1cca39 (diff)
parent67fee40483258a90bc47abeba02deee7fa744317 (diff)
Merge pull request #26563 from vnen/gdscript-fixes
A couple of GDScript fixes
-rw-r--r--modules/gdscript/gdscript_parser.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/modules/gdscript/gdscript_parser.cpp b/modules/gdscript/gdscript_parser.cpp
index aff39f0b07..5619729c13 100644
--- a/modules/gdscript/gdscript_parser.cpp
+++ b/modules/gdscript/gdscript_parser.cpp
@@ -3057,7 +3057,6 @@ void GDScriptParser::_parse_block(BlockNode *p_block, bool p_static) {
}
DataType iter_type;
- iter_type.is_constant = true;
if (container->type == Node::TYPE_OPERATOR) {
@@ -5445,7 +5444,7 @@ GDScriptParser::DataType GDScriptParser::_resolve_type(const DataType &p_source,
String script_path = ScriptServer::get_global_class_path(id);
if (script_path == self_path) {
result.kind = DataType::CLASS;
- result.class_type = current_class;
+ result.class_type = static_cast<ClassNode *>(head);
} else {
Ref<Script> script = ResourceLoader::load(script_path);
Ref<GDScript> gds = script;