summaryrefslogtreecommitdiff
path: root/modules/gdscript
diff options
context:
space:
mode:
authorreduz <reduzio@gmail.com>2015-12-28 21:05:57 -0300
committerreduz <reduzio@gmail.com>2015-12-28 21:05:57 -0300
commitf7b64a62d115d4955a47ea6735960f535ed8133c (patch)
tree09cd8687202dfc49206b80aaa769cddd590d4a82 /modules/gdscript
parent30c12297dc6df7d35df140475c0cec7308aea77a (diff)
-renamed function get_relative_transform() to get_relative_transform_to_parent(), makes more sense
-fixed newly introduced bug in onready keyword, fixes #3155
Diffstat (limited to 'modules/gdscript')
-rw-r--r--modules/gdscript/gd_parser.cpp8
1 files changed, 2 insertions, 6 deletions
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'.");