summaryrefslogtreecommitdiff
path: root/thirdparty
diff options
context:
space:
mode:
authorWindy Darian <p123456638@msn.com>2019-04-10 23:45:26 -0400
committerWindy Darian <p123456638@msn.com>2019-04-10 23:45:26 -0400
commitf05af9d4922ab0ace26f7ef07b88710d4b9c4b03 (patch)
tree0afc89a418e284cfa2531d555683e973c1606782 /thirdparty
parent5823b5d77d47339c3c981953ca8178e7ef14b6df (diff)
fix vhacd namespace placing in thirdparty/vhacd/src/btConvexHullComputer.cpp
Diffstat (limited to 'thirdparty')
-rw-r--r--thirdparty/vhacd/src/btConvexHullComputer.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/thirdparty/vhacd/src/btConvexHullComputer.cpp b/thirdparty/vhacd/src/btConvexHullComputer.cpp
index 5ff3ab917e..15956fc0c4 100644
--- a/thirdparty/vhacd/src/btConvexHullComputer.cpp
+++ b/thirdparty/vhacd/src/btConvexHullComputer.cpp
@@ -3,8 +3,8 @@ Copyright (c) 2011 Ole Kniemeyer, MAXON, www.maxon.net
This software is provided 'as-is', without any express or implied warranty.
In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it freely,
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
@@ -21,11 +21,6 @@ subject to the following restrictions:
#ifdef __GNUC__
#include <stdint.h>
-
-//GODOT ADDITION
-namespace VHACD {
-//
-
#elif defined(_MSC_VER)
typedef __int32 int32_t;
typedef __int64 int64_t;
@@ -54,6 +49,10 @@ typedef unsigned long long int32_t uint64_t;
#include <stdio.h>
#endif
+//GODOT ADDITION
+namespace VHACD {
+//
+
// Convex hull implementation based on Preparata and Hong
// Ole Kniemeyer, MAXON Computer GmbH
class btConvexHullInternal {