From f7b64a62d115d4955a47ea6735960f535ed8133c Mon Sep 17 00:00:00 2001 From: reduz Date: Mon, 28 Dec 2015 21:05:57 -0300 Subject: -renamed function get_relative_transform() to get_relative_transform_to_parent(), makes more sense -fixed newly introduced bug in onready keyword, fixes #3155 --- modules/gdscript/gd_parser.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'modules/gdscript/gd_parser.cpp') diff --git a/modules/gdscript/gd_parser.cpp b/modules/gdscript/gd_parser.cpp index 95e172e26e..3da12fc38b 100644 --- a/modules/gdscript/gd_parser.cpp +++ b/modules/gdscript/gd_parser.cpp @@ -2769,12 +2769,8 @@ void GDParser::_parse_class(ClassNode *p_class) { }; //fallthrough to var case GDTokenizer::TK_PR_ONREADY: { - if (tokenizer->get_token(-1)==GDTokenizer::TK_PR_EXPORT) { - current_export=PropertyInfo(); - _set_error("Expected 'var' (can't combine with 'onready')."); - return; - } else { - + if (token==GDTokenizer::TK_PR_ONREADY) { + //may be fallthrough from export, ignore if so tokenizer->advance(); if (tokenizer->get_token()!=GDTokenizer::TK_PR_VAR) { _set_error("Expected 'var'."); -- cgit v1.2.3