diff options
author | RĂ©mi Verschelde <remi@verschelde.fr> | 2022-02-06 16:40:59 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-02-06 16:40:59 +0100 |
commit | e38df41de8f20516ab8b2c91bedb4388cd9e41aa (patch) | |
tree | b3823839f7d1ba31b3e118d5585de0233146a1a9 /core/math/vector2i.h | |
parent | 762a31169d5e0939fda5bdaab537cec5ab39f870 (diff) | |
parent | 8c7268664da7ef98f802ec90fa2ba17b4d695847 (diff) |
Merge pull request #57607 from reduz/fix-variant-vec-integer-float-mul-div
Diffstat (limited to 'core/math/vector2i.h')
-rw-r--r-- | core/math/vector2i.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/core/math/vector2i.h b/core/math/vector2i.h index 446e05f5dd..707c8c9490 100644 --- a/core/math/vector2i.h +++ b/core/math/vector2i.h @@ -119,19 +119,21 @@ struct _NO_DISCARD_ Vector2i { } }; -_FORCE_INLINE_ Vector2i operator*(const int32_t &p_scalar, const Vector2i &p_vector) { +// Multiplication operators required to workaround issues with LLVM using implicit conversion. + +_FORCE_INLINE_ Vector2i operator*(const int32_t p_scalar, const Vector2i &p_vector) { return p_vector * p_scalar; } -_FORCE_INLINE_ Vector2i operator*(const int64_t &p_scalar, const Vector2i &p_vector) { +_FORCE_INLINE_ Vector2i operator*(const int64_t p_scalar, const Vector2i &p_vector) { return p_vector * p_scalar; } -_FORCE_INLINE_ Vector2i operator*(const float &p_scalar, const Vector2i &p_vector) { +_FORCE_INLINE_ Vector2i operator*(const float p_scalar, const Vector2i &p_vector) { return p_vector * p_scalar; } -_FORCE_INLINE_ Vector2i operator*(const double &p_scalar, const Vector2i &p_vector) { +_FORCE_INLINE_ Vector2i operator*(const double p_scalar, const Vector2i &p_vector) { return p_vector * p_scalar; } |