diff options
| author | Mariano Javier Suligoy <marianognu.easyrpg@gmail.com> | 2015-08-30 19:39:36 -0300 |
|---|---|---|
| committer | Mariano Javier Suligoy <marianognu.easyrpg@gmail.com> | 2015-08-30 19:39:36 -0300 |
| commit | 553edf1f250f34ca0ef0703b13b4d601f609e491 (patch) | |
| tree | 54e7cbf1ed368a872441ef6efc2fa2c027c45c89 /modules/gdscript/gd_parser.h | |
| parent | 680402cebf63066abcc93e7e8035e457c6305874 (diff) | |
| parent | 2d8866574dd2c06ac03e7055642b917a0a3c6dac (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
# Solved Conflicts:
# scene/gui/spin_box.cpp
# scene/gui/tree.cpp
Diffstat (limited to 'modules/gdscript/gd_parser.h')
| -rw-r--r-- | modules/gdscript/gd_parser.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/modules/gdscript/gd_parser.h b/modules/gdscript/gd_parser.h index fd8a2576fa..134279b6d8 100644 --- a/modules/gdscript/gd_parser.h +++ b/modules/gdscript/gd_parser.h @@ -419,10 +419,12 @@ private: BlockNode *completion_block; int completion_line; int completion_argument; + bool completion_found; PropertyInfo current_export; void _set_error(const String& p_error, int p_line=-1, int p_column=-1); + bool _recover_from_completion(); bool _parse_arguments(Node* p_parent, Vector<Node*>& p_args, bool p_static, bool p_can_codecomplete=false); |