diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-04-11 17:48:49 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2019-04-11 18:20:32 +0200 |
| commit | 668439d16a5c30587ab77461fb3211306ad62587 (patch) | |
| tree | 406ed91ea98191074cc629733727884d3e8af07a /thirdparty/vhacd/src | |
| parent | 531b1588973ef0d0631e06353ca65131d97c00ae (diff) | |
vhacd: Reapply downstream changes to namespace conflicting bullet code
Also adding a patch to easily identify and reapply them.
Diffstat (limited to 'thirdparty/vhacd/src')
| -rw-r--r-- | thirdparty/vhacd/src/btAlignedAllocator.cpp | 8 | ||||
| -rw-r--r-- | thirdparty/vhacd/src/btConvexHullComputer.cpp | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/thirdparty/vhacd/src/btAlignedAllocator.cpp b/thirdparty/vhacd/src/btAlignedAllocator.cpp index 11d594f6c9..ce0e7f26f9 100644 --- a/thirdparty/vhacd/src/btAlignedAllocator.cpp +++ b/thirdparty/vhacd/src/btAlignedAllocator.cpp @@ -15,6 +15,10 @@ subject to the following restrictions: #include "btAlignedAllocator.h" +// -- GODOT start -- +namespace VHACD { +// -- GODOT end -- + #ifdef _MSC_VER #pragma warning(disable:4311 4302) #endif @@ -177,4 +181,8 @@ void btAlignedFreeInternal(void* ptr) sAlignedFreeFunc(ptr); } +// -- GODOT start -- +}; // namespace VHACD +// -- GODOT end -- + #endif //BT_DEBUG_MEMORY_ALLOCATIONS diff --git a/thirdparty/vhacd/src/btConvexHullComputer.cpp b/thirdparty/vhacd/src/btConvexHullComputer.cpp index d3d749adbe..8ab34af2ab 100644 --- a/thirdparty/vhacd/src/btConvexHullComputer.cpp +++ b/thirdparty/vhacd/src/btConvexHullComputer.cpp @@ -49,6 +49,10 @@ typedef unsigned long long int32_t uint64_t; #include <stdio.h> #endif +// -- GODOT start -- +namespace VHACD { +// -- GODOT end -- + // Convex hull implementation based on Preparata and Hong // Ole Kniemeyer, MAXON Computer GmbH class btConvexHullInternal { @@ -2477,3 +2481,7 @@ btScalar btConvexHullComputer::compute(const void* coords, bool doubleCoords, in return shift; } + +// -- GODOT start -- +}; // namespace VHACD +// -- GODOT end -- |