diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-01-18 12:32:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-18 12:32:23 +0100 |
| commit | 7ae4cb7f7dc9913f6b1c7e9c9ff90a481ce93ba7 (patch) | |
| tree | bc5d4c7cf37175c167069937c478096413dbd971 /modules/gdscript/gdscript_functions.cpp | |
| parent | 6384dd8f2ca80b47e3b7d426906ec5a8bb2c93da (diff) | |
| parent | d024979e84155a745f56d239f8b87c49c8b067bf (diff) | |
Merge pull request #25093 from akien-mga/lerp-returns-variant
GDScript: Fix return value of "lerp" builtin
Diffstat (limited to 'modules/gdscript/gdscript_functions.cpp')
| -rw-r--r-- | modules/gdscript/gdscript_functions.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/gdscript/gdscript_functions.cpp b/modules/gdscript/gdscript_functions.cpp index 6c1a796ca0..44d44462ca 100644 --- a/modules/gdscript/gdscript_functions.cpp +++ b/modules/gdscript/gdscript_functions.cpp @@ -1565,7 +1565,8 @@ MethodInfo GDScriptFunctions::get_info(Function p_func) { } break; case MATH_LERP: { MethodInfo mi("lerp", PropertyInfo(Variant::NIL, "from"), PropertyInfo(Variant::NIL, "to"), PropertyInfo(Variant::REAL, "weight")); - mi.return_val.type = Variant::REAL; + mi.return_val.type = Variant::NIL; + mi.return_val.usage |= PROPERTY_USAGE_NIL_IS_VARIANT; return mi; } break; case MATH_INVERSE_LERP: { |