diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-08-23 12:10:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-23 12:10:54 +0200 |
| commit | 92aafa898fba31b417093de75cf681ae60fdaf7f (patch) | |
| tree | 6583702ee9ac742627b8544be4c7379ef58a10b7 /core/math/expression.cpp | |
| parent | 7f8f76ffbbe7f6983d0362ce2d50b7cd4bca664c (diff) | |
| parent | fb3506d796b1630305e2c5fcdfc509a0d81dda4f (diff) | |
Merge pull request #21305 from Mr-Slurpy/expression-fix
Fixed bugs in expression class
Diffstat (limited to 'core/math/expression.cpp')
| -rw-r--r-- | core/math/expression.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/math/expression.cpp b/core/math/expression.cpp index a161dbddba..1a79385a29 100644 --- a/core/math/expression.cpp +++ b/core/math/expression.cpp @@ -177,7 +177,7 @@ int Expression::get_func_argument_count(BuiltinFunc p_func) { } void Expression::exec_func(BuiltinFunc p_func, const Variant **p_inputs, Variant *r_return, Variant::CallError &r_error, String &r_error_str) { - + r_error.error = Variant::CallError::CALL_OK; switch (p_func) { case MATH_SIN: { @@ -1916,7 +1916,7 @@ bool Expression::_execute(const Array &p_inputs, Object *p_instance, Expression: bool valid; r_ret = base.get_named(index->name, &valid); if (!valid) { - r_error_str = vformat(RTR("Invalid named index '%s' for base type "), String(index->name), Variant::get_type_name(base.get_type())); + r_error_str = vformat(RTR("Invalid named index '%s' for base type %s"), String(index->name), Variant::get_type_name(base.get_type())); return true; } |