Merge pull request #1770 from Zylann/basis_abs

dsnopek · web-flow · commit 70d8ff0c4710 · 2025-04-16T16:10:07.000-05:00
Use Math::abs to avoid ambiguity with integer abs
diff --git a/src/variant/basis.cpp b/src/variant/basis.cpp
@@ -272,7 +272,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 != std::signbit(dots.x + dots.y + dots.z)) {

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