diff options
| author | Andrii Doroshenko (Xrayez) <xrayez@gmail.com> | 2017-07-20 12:51:15 +0300 |
|---|---|---|
| committer | Andrii Doroshenko (Xrayez) <xrayez@gmail.com> | 2017-07-25 12:14:40 +0300 |
| commit | 72436956ddcdfdcb9edea5c447363391c23552c4 (patch) | |
| tree | 07a166d8ba7f24996e54eeef14388288355f981b /core | |
| parent | 303370d03d71ad7ea194250fdfc94f7f1928fb47 (diff) | |
Update GDScript completion names for Pool*Arrays
Notice: GDScript tokenizer used the old PoolFloatArray name.
Renamed PoolFloatArray to PoolRealArray.
Moved "project_settings.h" down one line to comply with the clang-format rules.
Fixes #9638
Closed pull request #9714 because I messed up with commits, sorry!
Diffstat (limited to 'core')
| -rw-r--r-- | core/variant_parser.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/variant_parser.cpp b/core/variant_parser.cpp index 26a6a05a30..398f20caf3 100644 --- a/core/variant_parser.cpp +++ b/core/variant_parser.cpp @@ -1099,7 +1099,7 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream, return OK; - } else if (id == "PoolFloatArray" || id == "FloatArray") { + } else if (id == "PoolRealArray" || id == "FloatArray") { Vector<float> args; Error err = _parse_construct<float>(p_stream, args, line, r_err_str); @@ -1855,7 +1855,7 @@ Error VariantWriter::write(const Variant &p_variant, StoreStringFunc p_store_str } break; case Variant::POOL_REAL_ARRAY: { - p_store_string_func(p_store_string_ud, "PoolFloatArray( "); + p_store_string_func(p_store_string_ud, "PoolRealArray( "); PoolVector<real_t> data = p_variant; int len = data.size(); PoolVector<real_t>::Read r = data.read(); |