diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-23 01:38:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-23 01:38:23 +0100 |
| commit | 63b0d822d109f3612d5c22e4342ebef9cd3b9163 (patch) | |
| tree | 0aa6e9899eb14b5ae5dc8f7b25d03532606c06b2 /modules/gdscript/gdscript_functions.cpp | |
| parent | f2d8c4eb8b3ecb0f62046e40cc76973e8cccc0fd (diff) | |
| parent | 6da0eef9e6695e0da17953d80a1e6b0b673b4678 (diff) | |
| download | redot-engine-63b0d822d109f3612d5c22e4342ebef9cd3b9163.tar.gz | |
Merge pull request #36436 from reduz/new-variant-types
Add support for Vector2i, Rect2i and Vector3i to Variant
Diffstat (limited to 'modules/gdscript/gdscript_functions.cpp')
| -rw-r--r-- | modules/gdscript/gdscript_functions.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gdscript/gdscript_functions.cpp b/modules/gdscript/gdscript_functions.cpp index 18ec147c13..426b5b58cb 100644 --- a/modules/gdscript/gdscript_functions.cpp +++ b/modules/gdscript/gdscript_functions.cpp @@ -365,7 +365,7 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_ r_ret = ((Vector2)*p_args[0]).linear_interpolate((Vector2)*p_args[1], t); } break; case Variant::VECTOR3: { - r_ret = ((Vector3)*p_args[0]).linear_interpolate((Vector3)*p_args[1], t); + r_ret = (p_args[0]->operator Vector3()).linear_interpolate(p_args[1]->operator Vector3(), t); } break; case Variant::COLOR: { r_ret = ((Color)*p_args[0]).linear_interpolate((Color)*p_args[1], t); |