diff options
| author | Noshyaar <poommetee@protonmail.com> | 2018-08-10 18:05:16 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-10 18:05:16 +0700 |
| commit | 6e0adf3656183602f3603b8a26319bcaf84eb7dd (patch) | |
| tree | f57008d3a9da5bd92e129025268bb0118666c4e0 /core/math | |
| parent | b293dd363e378ffd43e1385e024429d2d7526158 (diff) | |
| parent | da1f1619fe65bb974bd8fd89345bef017be80d72 (diff) | |
Merge pull request #20842 from marcelofg55/osx_build_err
Fix clang compile error
Diffstat (limited to 'core/math')
| -rw-r--r-- | core/math/expression.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/math/expression.cpp b/core/math/expression.cpp index b92cde07ce..a161dbddba 100644 --- a/core/math/expression.cpp +++ b/core/math/expression.cpp @@ -2114,7 +2114,7 @@ String Expression::get_error_text() const { void Expression::_bind_methods() { ClassDB::bind_method(D_METHOD("parse", "expression", "input_names"), &Expression::parse, DEFVAL(Vector<String>())); - ClassDB::bind_method(D_METHOD("execute", "inputs", "base_instance", "show_error"), &Expression::execute, DEFVAL(Array()), DEFVAL(NULL), DEFVAL(true)); + ClassDB::bind_method(D_METHOD("execute", "inputs", "base_instance", "show_error"), &Expression::execute, DEFVAL(Array()), DEFVAL(Variant()), DEFVAL(true)); ClassDB::bind_method(D_METHOD("has_execute_failed"), &Expression::has_execute_failed); ClassDB::bind_method(D_METHOD("get_error_text"), &Expression::get_error_text); } |