Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergej Reich <sergej.reich@googlemail.com>2013-10-25 07:43:20 +0400
committerSergej Reich <sergej.reich@googlemail.com>2013-10-25 07:43:20 +0400
commit472a021aca3c0a6278151f7abee4e0970b026e3f (patch)
tree3456ce084e33450cc21c68beca1bd407801bf256 /extern/bullet2/src/LinearMath/btSerializer.h
parent4514eeaa8e335a86de0bda68aa4814c0bafad7eb (diff)
bullet: Update to version 2.82 (bullet revision 2705)
Remove patch that has been applied upstream. Fixes several bugs.
Diffstat (limited to 'extern/bullet2/src/LinearMath/btSerializer.h')
-rw-r--r--extern/bullet2/src/LinearMath/btSerializer.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/extern/bullet2/src/LinearMath/btSerializer.h b/extern/bullet2/src/LinearMath/btSerializer.h
index c5bc96b7839..ff1dc574c5d 100644
--- a/extern/bullet2/src/LinearMath/btSerializer.h
+++ b/extern/bullet2/src/LinearMath/btSerializer.h
@@ -17,7 +17,6 @@ subject to the following restrictions:
#define BT_SERIALIZER_H
#include "btScalar.h" // has definitions like SIMD_FORCE_INLINE
-#include "btStackAlloc.h"
#include "btHashMap.h"
#if !defined( __CELLOS_LV2__) && !defined(__MWERKS__)
@@ -439,7 +438,7 @@ public:
buffer[9] = '2';
buffer[10] = '8';
- buffer[11] = '1';
+ buffer[11] = '2';
}