summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorerwin coumans <erwin.coumans@gmail.com>2022-04-25 19:32:45 -0700
committererwin coumans <erwin.coumans@gmail.com>2022-04-25 19:32:45 -0700
commitfdab95dbabbdb1c4b0e363abe127f8e6984de7a7 (patch)
treef03ef41cd7e3bd9cda4ae64a9b3e3b26830d1cb9
parenta899725cc699354765dda47398e039e7bd58bfb4 (diff)
parentae4c1f8e72964790ec1214baf3e8b0a031a5c08b (diff)
downloadbullet3-fdab95dbabbdb1c4b0e363abe127f8e6984de7a7.tar.gz
Merge branch 'master' of github.com:erwincoumans/bullet3
-rw-r--r--VERSION2
-rw-r--r--setup.py2
-rw-r--r--src/LinearMath/btScalar.h2
-rw-r--r--src/LinearMath/btSerializer.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/VERSION b/VERSION
index 0f4de9d99..bd2342316 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.23
+3.24
diff --git a/setup.py b/setup.py
index 21a6c2d2f..86a7a9cbe 100644
--- a/setup.py
+++ b/setup.py
@@ -505,7 +505,7 @@ if 'BT_USE_EGL' in EGL_CXX_FLAGS:
setup(
name='pybullet',
- version='3.2.3',
+ version='3.2.4',
description=
'Official Python Interface for the Bullet Physics SDK specialized for Robotics Simulation and Reinforcement Learning',
long_description=
diff --git a/src/LinearMath/btScalar.h b/src/LinearMath/btScalar.h
index e27b71594..9f5408c79 100644
--- a/src/LinearMath/btScalar.h
+++ b/src/LinearMath/btScalar.h
@@ -25,7 +25,7 @@ subject to the following restrictions:
#include <float.h>
/* SVN $Revision$ on $Date$ from http://bullet.googlecode.com*/
-#define BT_BULLET_VERSION 323
+#define BT_BULLET_VERSION 324
inline int btGetVersion()
{
diff --git a/src/LinearMath/btSerializer.h b/src/LinearMath/btSerializer.h
index 9c5525fb9..59695ab32 100644
--- a/src/LinearMath/btSerializer.h
+++ b/src/LinearMath/btSerializer.h
@@ -481,7 +481,7 @@ public:
buffer[9] = '3';
buffer[10] = '2';
- buffer[11] = '3';
+ buffer[11] = '4';
}
virtual void startSerialization()