summaryrefslogtreecommitdiff
path: root/modules/gdscript
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2019-01-18 10:46:52 +0100
committerRémi Verschelde <rverschelde@gmail.com>2019-01-18 10:47:04 +0100
commitd024979e84155a745f56d239f8b87c49c8b067bf (patch)
tree38d6fd22048c504706de1277a2f65228d401d724 /modules/gdscript
parentce36351065c3a21d6582a7bce7d2c7cbdb5fe045 (diff)
GDScript: Fix return value of "lerp" builtin
Fixes #25082, fixes #24709.
Diffstat (limited to 'modules/gdscript')
-rw-r--r--modules/gdscript/gdscript_functions.cpp3
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: {