summaryrefslogtreecommitdiff
path: root/servers/physics
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2017-03-05 15:56:52 +0100
committerRémi Verschelde <rverschelde@gmail.com>2017-03-05 16:29:53 +0100
commit45438e9918d421b244bfd7776a30e67dc7f2d3e3 (patch)
treec841b8976a97d7a3e40e6a1b58f9bd612658b668 /servers/physics
parent131631b00997b39b5fce07483176ee465141cdff (diff)
Style: prevent bogus macro formatting by clang-format
Also prevent formatting of thirdparty snippet
Diffstat (limited to 'servers/physics')
-rw-r--r--servers/physics/gjk_epa.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/servers/physics/gjk_epa.cpp b/servers/physics/gjk_epa.cpp
index 92ca5ea8dd..06c2c2382c 100644
--- a/servers/physics/gjk_epa.cpp
+++ b/servers/physics/gjk_epa.cpp
@@ -28,6 +28,9 @@
/*************************************************************************/
#include "gjk_epa.h"
+/* Disabling formatting for thirdparty code snippet */
+/* clang-format off */
+
/*************** Bullet's GJK-EPA2 IMPLEMENTATION *******************/
// Config
@@ -879,8 +882,7 @@ bool Penetration( const ShapeSW* shape0,
} // end of namespace
-
-
+/* clang-format on */
bool gjk_epa_calculate_distance(const ShapeSW *p_shape_A, const Transform& p_transform_A, const ShapeSW *p_shape_B, const Transform& p_transform_B, Vector3& r_result_A, Vector3& r_result_B) {
@@ -915,4 +917,3 @@ bool gjk_epa_calculate_penetration(const ShapeSW *p_shape_A, const Transform& p_
return false;
}
-