diff options
| author | Nathan Warden <nathanwardenlee@icloud.com> | 2015-02-20 16:28:48 -0500 |
|---|---|---|
| committer | Nathan Warden <nathanwardenlee@icloud.com> | 2015-02-20 16:28:48 -0500 |
| commit | bfad3923878aa9b485f90a37bc04944828e35f27 (patch) | |
| tree | ec8cdf579272be5832430c2f9078a367fe98e2ba | |
| parent | 071b2ea4f205ea99346a5cf73afdd50f7ccc95ed (diff) | |
Updated the variable in the lerp function to be weight instead of percent.
| -rw-r--r-- | doc/base/classes.xml | 2 | ||||
| -rw-r--r-- | modules/gdscript/gd_functions.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/base/classes.xml b/doc/base/classes.xml index 7c5530682e..8271c5f7b6 100644 --- a/doc/base/classes.xml +++ b/doc/base/classes.xml @@ -261,7 +261,7 @@ </argument> <argument index="1" name="to" type="float"> </argument> - <argument index="2" name="percent" type="float"> + <argument index="2" name="weight" type="float"> </argument> <description> Linear interpolates between two values by a normalized value. diff --git a/modules/gdscript/gd_functions.cpp b/modules/gdscript/gd_functions.cpp index b616d8f228..f37b2f645a 100644 --- a/modules/gdscript/gd_functions.cpp +++ b/modules/gdscript/gd_functions.cpp @@ -1101,7 +1101,7 @@ MethodInfo GDFunctions::get_info(Function p_func) { return mi; } break; case MATH_LERP: { - MethodInfo mi("lerp",PropertyInfo(Variant::REAL,"a"),PropertyInfo(Variant::REAL,"b"), PropertyInfo(Variant::REAL,"c")); + MethodInfo mi("lerp",PropertyInfo(Variant::REAL,"from"),PropertyInfo(Variant::REAL,"to"), PropertyInfo(Variant::REAL,"weight")); mi.return_val.type=Variant::REAL; return mi; } break; |