diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-11-09 14:34:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-09 14:34:49 +0100 |
| commit | 01154f1ad20e7c6707ef1229394a4330eb4e31b7 (patch) | |
| tree | 3a3195b3e39238c7c307b8d7e941a72871f60c0c /core/math/expression.cpp | |
| parent | eda8f69c19ffaa219bdb0afe67dfb7df17a46d1c (diff) | |
| parent | 221a2a17422dfbb7e0be5ca42fe56b91adb656e3 (diff) | |
Merge pull request #43403 from reduz/variant-constructor-refactor
Refactored variant constructor logic
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 426586fc9c..48ad73bd32 100644 --- a/core/math/expression.cpp +++ b/core/math/expression.cpp @@ -564,7 +564,7 @@ void Expression::exec_func(BuiltinFunc p_func, const Variant **p_inputs, Variant return; } else { - *r_return = Variant::construct(Variant::Type(type), p_inputs, 1, r_error); + Variant::construct(Variant::Type(type), *r_return, p_inputs, 1, r_error); } } break; case TYPE_OF: { @@ -2021,7 +2021,7 @@ bool Expression::_execute(const Array &p_inputs, Object *p_instance, Expression: } Callable::CallError ce; - r_ret = Variant::construct(constructor->data_type, (const Variant **)argp.ptr(), argp.size(), ce); + Variant::construct(constructor->data_type, r_ret, (const Variant **)argp.ptr(), argp.size(), ce); if (ce.error != Callable::CallError::CALL_OK) { r_error_str = vformat(RTR("Invalid arguments to construct '%s'"), Variant::get_type_name(constructor->data_type)); |