Merge pull request #3834 from erwincoumans/master

erwincoumans · web-flow · commit ebe1916b90ac · 2021-05-07T11:04:02.000-07:00
bump up pybullet version (and c++ version) to 3.17/3.1.7
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.08
+3.17
diff --git a/setup.py b/setup.py
@@ -501,7 +501,7 @@ def _single_compile(obj):
 
 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
@@ -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
@@ -480,8 +480,8 @@ class btDefaultSerializer : public btSerializer
 		}
 
 		buffer[9] = '3';
-		buffer[10] = '0';
-		buffer[11] = '8';
+		buffer[10] = '1';
+		buffer[11] = '7';
 	}
 
 	virtual void startSerialization()

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ subject to the following restrictions:`
`25`	`25`	`#include <float.h>`
`26`	`26`
`27`	`27`	`/* SVN $Revision$ on $Date$ from http://bullet.googlecode.com*/`
`28`		`-#define BT_BULLET_VERSION 307`
	`28`	`+#define BT_BULLET_VERSION 317`
`29`	`29`
`30`	`30`	`inline int btGetVersion()`
`31`	`31`	`{`
Original file line number	Diff line number	Diff line change
`@@ -480,8 +480,8 @@ class btDefaultSerializer : public btSerializer`
`480`	`480`	`}`
`481`	`481`
`482`	`482`	`buffer[9] = '3';`
`483`		`- buffer[10] = '0';`
`484`		`- buffer[11] = '8';`
	`483`	`+ buffer[10] = '1';`
	`484`	`+ buffer[11] = '7';`
`485`	`485`	`}`
`486`	`486`
`487`	`487`	`virtual void startSerialization()`