Merge pull request #24740 from OBKF/update-bullet-physics

Update Bullet physics to commit 126b676

1 files changed, 15 insertions, 17 deletions

diff --git a/thirdparty/bullet/LinearMath/btMinMax.h b/thirdparty/bullet/LinearMath/btMinMax.h
index 5b436e9ba4..92fea0275a 100644
--- a/thirdparty/bullet/LinearMath/btMinMax.h
+++ b/thirdparty/bullet/LinearMath/btMinMax.h
@@ -12,60 +12,58 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-
-
 #ifndef BT_GEN_MINMAX_H
 #define BT_GEN_MINMAX_H
 
 #include "btScalar.h"
 
 template <class T>
-SIMD_FORCE_INLINE const T& btMin(const T& a, const T& b) 
+SIMD_FORCE_INLINE const T& btMin(const T& a, const T& b)
 {
-  return a < b ? a : b ;
+	return a < b ? a : b;
 }
 
 template <class T>
-SIMD_FORCE_INLINE const T& btMax(const T& a, const T& b) 
+SIMD_FORCE_INLINE const T& btMax(const T& a, const T& b)
 {
-  return  a > b ? a : b;
+	return a > b ? a : b;
 }
 
 template <class T>
-SIMD_FORCE_INLINE const T& btClamped(const T& a, const T& lb, const T& ub) 
+SIMD_FORCE_INLINE const T& btClamped(const T& a, const T& lb, const T& ub)
 {
-	return a < lb ? lb : (ub < a ? ub : a); 
+	return a < lb ? lb : (ub < a ? ub : a);
 }
 
 template <class T>
-SIMD_FORCE_INLINE void btSetMin(T& a, const T& b) 
+SIMD_FORCE_INLINE void btSetMin(T& a, const T& b)
 {
-    if (b < a) 
+	if (b < a)
 	{
 		a = b;
 	}
 }
 
 template <class T>
-SIMD_FORCE_INLINE void btSetMax(T& a, const T& b) 
+SIMD_FORCE_INLINE void btSetMax(T& a, const T& b)
 {
-    if (a < b) 
+	if (a < b)
 	{
 		a = b;
 	}
 }
 
 template <class T>
-SIMD_FORCE_INLINE void btClamp(T& a, const T& lb, const T& ub) 
+SIMD_FORCE_INLINE void btClamp(T& a, const T& lb, const T& ub)
 {
-	if (a < lb) 
+	if (a < lb)
 	{
-		a = lb; 
+		a = lb;
 	}
-	else if (ub < a) 
+	else if (ub < a)
 	{
 		a = ub;
 	}
 }
 
-#endif //BT_GEN_MINMAX_H
+#endif  //BT_GEN_MINMAX_H