summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorerwincoumans <erwincoumans@google.com>2021-05-07 11:04:02 -0700
committerGitHub <noreply@github.com>2021-05-07 11:04:02 -0700
commitebe1916b90acae8b13cd8c6b637d8327cdc64e94 (patch)
tree10a9561eee4a211f2a550f28ab6b99c69dddadca
parent39d981bce606edaebccd5f89b9a7b24b1097aaf4 (diff)
parent092b7bc3d9efcf663acee8f1155a22258c779151 (diff)
downloadbullet3-3.17.tar.gz
Merge pull request #3834 from erwincoumans/master3.17
bump up pybullet version (and c++ version) to 3.17/3.1.7
-rw-r--r--VERSION2
-rw-r--r--setup.py2
-rw-r--r--src/LinearMath/btScalar.h2
-rw-r--r--src/LinearMath/btSerializer.h4
4 files changed, 5 insertions, 5 deletions
diff --git a/VERSION b/VERSION
index 6fe94f3c6..78c8a7428 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.08
+3.17
diff --git a/setup.py b/setup.py
index 7ad73531d..c00eeafbe 100644
--- a/setup.py
+++ b/setup.py
@@ -501,7 +501,7 @@ if 'BT_USE_EGL' in EGL_CXX_FLAGS:
setup(
name='pybullet',
- version='3.1.6',
+ version='3.1.7',
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 36b90cc94..b239217bb 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 307
+#define BT_BULLET_VERSION 317
inline int btGetVersion()
{
diff --git a/src/LinearMath/btSerializer.h b/src/LinearMath/btSerializer.h
index 4d1c760e2..ce4fc34e2 100644
--- a/src/LinearMath/btSerializer.h
+++ b/src/LinearMath/btSerializer.h
@@ -480,8 +480,8 @@ public:
}
buffer[9] = '3';
- buffer[10] = '0';
- buffer[11] = '8';
+ buffer[10] = '1';
+ buffer[11] = '7';
}
virtual void startSerialization()