Browse Source

Merge pull request #105460 from Zylann/basis_abs

Use `Math::abs` to avoid ambiguity with integer abs
Thaddeus Crews 4 months ago
parent
commit
6448ddf37e
1 changed files with 1 additions and 1 deletions
  1. 1 1
      core/math/basis.cpp

+ 1 - 1
core/math/basis.cpp

@@ -268,7 +268,7 @@ Basis Basis::scaled_orthogonal(const Vector3 &p_scale) const {
 	Vector3 dots;
 	Vector3 dots;
 	for (int i = 0; i < 3; i++) {
 	for (int i = 0; i < 3; i++) {
 		for (int j = 0; j < 3; j++) {
 		for (int j = 0; j < 3; j++) {
-			dots[j] += s[i] * abs(m.get_column(i).normalized().dot(b.get_column(j)));
+			dots[j] += s[i] * Math::abs(m.get_column(i).normalized().dot(b.get_column(j)));
 		}
 		}
 	}
 	}
 	if (sign != signbit(dots.x + dots.y + dots.z)) {
 	if (sign != signbit(dots.x + dots.y + dots.z)) {