summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2020-11-11 13:20:19 +0100
committerGitHub <noreply@github.com>2020-11-11 13:20:19 +0100
commitfb2151089cea5da6c2293894f9686db6d50fbf92 (patch)
tree6e1faa845af77a09f3ad65cd023b9f7c3fe81f90 /core
parentacb7d99fce31ab99a807a76003815f09e98f62c8 (diff)
parentee79fc627c18d26221adeae2b641ba81ba662184 (diff)
Merge pull request #43372 from aaronfranke/clamp-fixes
Minor clamp and float fixes
Diffstat (limited to 'core')
-rw-r--r--core/math/transform_2d.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/math/transform_2d.cpp b/core/math/transform_2d.cpp
index 180aeaa0af..00e561f973 100644
--- a/core/math/transform_2d.cpp
+++ b/core/math/transform_2d.cpp
@@ -251,7 +251,7 @@ Transform2D Transform2D::interpolate_with(const Transform2D &p_transform, real_t
real_t dot = v1.dot(v2);
- dot = (dot < -1.0) ? -1.0 : ((dot > 1.0) ? 1.0 : dot); //clamp dot to [-1,1]
+ dot = CLAMP(dot, -1.0, 1.0);
Vector2 v;