Merge pull request #105460 from Zylann/basis_abs

Repiteo · Repiteo · commit 6448ddf37ecd · 2025-04-16T15:39:22.000-05:00
Use `Math::abs` to avoid ambiguity with integer abs
diff --git a/core/math/basis.cpp b/core/math/basis.cpp
@@ -268,7 +268,7 @@ Basis Basis::scaled_orthogonal(const Vector3 &p_scale) const {
 	Vector3 dots;
 	for (int i = 0; i < 3; i++) {
 		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)) {

Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,7 @@ Basis Basis::scaled_orthogonal(const Vector3 &p_scale) const {`
`268`	`268`	`Vector3 dots;`
`269`	`269`	`for (int i = 0; i < 3; i++) {`
`270`	`270`	`for (int j = 0; j < 3; j++) {`
`271`		`- dots[j] += s[i] * abs(m.get_column(i).normalized().dot(b.get_column(j)));`
	`271`	`+ dots[j] += s[i] * Math::abs(m.get_column(i).normalized().dot(b.get_column(j)));`
`272`	`272`	`}`
`273`	`273`	`}`
`274`	`274`	`if (sign != signbit(dots.x + dots.y + dots.z)) {`