godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

-renamed function get_relative_transform() to get_relative_transform_to_parent(), makes more sense

Browse Source 
-fixed newly introduced bug in onready keyword, fixes #3155
This commit is contained in:
reduz
2015-12-28 21:05:57 -03:00
parent 30c12297dc
commit f7b64a62d1
5 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/gdscript/gd_parser.cpp
View File

@@ -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'.");