diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-09-27 08:46:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-27 08:46:37 +0200 |
| commit | fc481db1c3187688d54b5afdb7a1ebb3e4d506c2 (patch) | |
| tree | ac67cf34523b93a7747aa2676154693128d5a348 /core/variant_call.cpp | |
| parent | 68e4454c31278fc44cc1ce42a7405a9acf42a38f (diff) | |
| parent | 9394c057b871d1e52ae8995a56948dfae0f5583e (diff) | |
Merge pull request #37403 from aaronfranke/basis_equal_approx
Change Basis is_equal_approx to use instance method
Diffstat (limited to 'core/variant_call.cpp')
| -rw-r--r-- | core/variant_call.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/variant_call.cpp b/core/variant_call.cpp index 0ebb2f04a1..5fd970c8e1 100644 --- a/core/variant_call.cpp +++ b/core/variant_call.cpp @@ -1035,7 +1035,7 @@ struct _VariantCall { VCALL_PTR0R(Basis, get_orthogonal_index); VCALL_PTR0R(Basis, orthonormalized); VCALL_PTR2R(Basis, slerp); - VCALL_PTR2R(Basis, is_equal_approx); // TODO: Break compatibility in 4.0 to change this to an instance method (a.is_equal_approx(b) as VCALL_PTR1R) for consistency. + VCALL_PTR1R(Basis, is_equal_approx); VCALL_PTR0R(Basis, get_rotation_quat); VCALL_PTR0R(Transform, inverse); @@ -2356,7 +2356,7 @@ void register_variant_methods() { ADDFUNC1R(BASIS, VECTOR3, Basis, xform_inv, VECTOR3, "v", varray()); ADDFUNC0R(BASIS, INT, Basis, get_orthogonal_index, varray()); ADDFUNC2R(BASIS, BASIS, Basis, slerp, BASIS, "b", FLOAT, "t", varray()); - ADDFUNC2R(BASIS, BOOL, Basis, is_equal_approx, BASIS, "b", FLOAT, "epsilon", varray(CMP_EPSILON)); // TODO: Replace in 4.0, see other TODO. + ADDFUNC1R(BASIS, BOOL, Basis, is_equal_approx, BASIS, "b", varray()); ADDFUNC0R(BASIS, QUAT, Basis, get_rotation_quat, varray()); ADDFUNC0R(TRANSFORM, TRANSFORM, Transform, inverse, varray()); |