diff options
| author | Mariano Javier Suligoy | 2015-08-30 02:48:45 -0300 |
|---|---|---|
| committer | Mariano Javier Suligoy | 2015-08-30 02:48:45 -0300 |
| commit | c688b55019e485ddf66cd119173016ec6c8bd4e5 (patch) | |
| tree | 8f1d9eac70d8689545a66a378b4937530b42e8a7 /modules/gdscript/gd_parser.cpp | |
| parent | a19a653e2cae50f43b8de5d4ba69170c7d2fa800 (diff) | |
| parent | 7bc9846f169a0a65970c64ca3fc2e799eaa8b990 (diff) | |
| download | godot-c688b55019e485ddf66cd119173016ec6c8bd4e5.tar.gz godot-c688b55019e485ddf66cd119173016ec6c8bd4e5.tar.zst godot-c688b55019e485ddf66cd119173016ec6c8bd4e5.zip | |
Merge branch 'master' of https://github.com/okamstudio/godot
# Solved Conflicts:
# tools/editor/property_editor.cpp
# tools/editor/property_editor.h
Diffstat (limited to 'modules/gdscript/gd_parser.cpp')
| -rw-r--r-- | modules/gdscript/gd_parser.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/gdscript/gd_parser.cpp b/modules/gdscript/gd_parser.cpp index f7aaaf7ee..283b50f96 100644 --- a/modules/gdscript/gd_parser.cpp +++ b/modules/gdscript/gd_parser.cpp @@ -2625,14 +2625,14 @@ void GDParser::_parse_class(ClassNode *p_class) { Node *subexpr=NULL; - subexpr = _parse_and_reduce_expression(p_class,false); + subexpr = _parse_and_reduce_expression(p_class,false,autoexport); if (!subexpr) return; member.expression=subexpr; if (autoexport) { - if (subexpr->type==Node::TYPE_ARRAY) { + if (1)/*(subexpr->type==Node::TYPE_ARRAY) { member._export.type=Variant::ARRAY; @@ -2640,7 +2640,7 @@ void GDParser::_parse_class(ClassNode *p_class) { member._export.type=Variant::DICTIONARY; - } else { + } else*/ { if (subexpr->type!=Node::TYPE_CONSTANT) { |