diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-01-03 16:53:39 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-01-03 16:53:39 -0300 |
| commit | ddf7457894abf4678727b8a751575fee3e0e55ac (patch) | |
| tree | 33cc7904f0e8bd6bf1671f80481d759c9552f1e1 /core/io/json.cpp | |
| parent | fbdd925d9be1c4c96d05089d7d5a58cd938b002c (diff) | |
| parent | 507736690de2f4125aec25ecb0339196fb89ba56 (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'core/io/json.cpp')
| -rw-r--r-- | core/io/json.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/io/json.cpp b/core/io/json.cpp index a83d7e4d6e..88a23eb4cd 100644 --- a/core/io/json.cpp +++ b/core/io/json.cpp @@ -250,7 +250,7 @@ Error JSON::_get_token(const CharType *p_str, int &idx, int p_len, Token& r_toke if (p_str[idx]=='-' || (p_str[idx]>='0' && p_str[idx]<='9')) { //a number const CharType *rptr; - double number = String::to_double(&p_str[idx],-1,&rptr); + double number = String::to_double(&p_str[idx],&rptr); idx+=(rptr - &p_str[idx]); r_token.type=TK_NUMBER; r_token.value=number; |