diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-08-20 12:54:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-20 12:54:40 +0200 |
| commit | a8db4c848d72214f9913ea521f802b477f7ea259 (patch) | |
| tree | ffcdfb8bdacab5459fc1ce7532db145c6f9ea799 /scene/resources | |
| parent | e84d83ce7805bc3f91c091efd426f1ca4389e044 (diff) | |
| parent | 7c9c6df7e48ffbe63c402b20f60ba369b34f4e98 (diff) | |
Merge pull request #31395 from ptrojahn/floatsarenasty
Replace is_zero_approx(A.distance_to(B)) with A==B
Diffstat (limited to 'scene/resources')
| -rw-r--r-- | scene/resources/animation.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scene/resources/animation.cpp b/scene/resources/animation.cpp index 8c8552ac54..985b38f913 100644 --- a/scene/resources/animation.cpp +++ b/scene/resources/animation.cpp @@ -2870,9 +2870,9 @@ bool Animation::_transform_track_optimize_key(const TKey<TransformKey> &t0, cons const Vector3 &v1 = t1.value.loc; const Vector3 &v2 = t2.value.loc; - if (Math::is_zero_approx(v0.distance_to(v2))) { + if (v0 == v2) { //0 and 2 are close, let's see if 1 is close - if (!Math::is_zero_approx(v0.distance_to(v1))) { + if (v0 != v1) { //not close, not optimizable return false; } @@ -2959,9 +2959,9 @@ bool Animation::_transform_track_optimize_key(const TKey<TransformKey> &t0, cons const Vector3 &v1 = t1.value.scale; const Vector3 &v2 = t2.value.scale; - if (Math::is_zero_approx(v0.distance_to(v2))) { + if (v0 == v2) { //0 and 2 are close, let's see if 1 is close - if (!Math::is_zero_approx(v0.distance_to(v1))) { + if (v0 != v1) { //not close, not optimizable return false; } |