diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-01-13 16:10:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-13 16:10:44 +0100 |
| commit | 0b409d89d04d4cfed9fb559df8a3b379aba6ea2b (patch) | |
| tree | 4e753cc811a27180dc88d7fadfdb1cf937b799ac /core | |
| parent | 59495adb7c4b4dc2374a4a4d8cd0360ccf293a32 (diff) | |
| parent | af878716f2620fb9142b960253dc82f60ab23df2 (diff) | |
Merge pull request #45136 from akien-mga/clang-format-11
CI: Update to clang-format 11 and apply ternary operator changes
Diffstat (limited to 'core')
| -rw-r--r-- | core/math/basis.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/math/basis.cpp b/core/math/basis.cpp index 26b4caba39..cbdd8a8c9f 100644 --- a/core/math/basis.cpp +++ b/core/math/basis.cpp @@ -790,8 +790,8 @@ Quat Basis::get_quat() const { temp[2] = ((m.elements[1][0] - m.elements[0][1]) * s); } else { int i = m.elements[0][0] < m.elements[1][1] ? - (m.elements[1][1] < m.elements[2][2] ? 2 : 1) : - (m.elements[0][0] < m.elements[2][2] ? 2 : 0); + (m.elements[1][1] < m.elements[2][2] ? 2 : 1) : + (m.elements[0][0] < m.elements[2][2] ? 2 : 0); int j = (i + 1) % 3; int k = (i + 2) % 3; |