Merge remote-tracking branch 'bp/master'

2017-06-13 11:06:12 -07:00
parent c84416d932 5692137554
commit ab6d5c9c53
1 changed files with 1 additions and 1 deletions
--- a/examples/pybullet/pybullet.c
+++ b/examples/pybullet/pybullet.c
@@ -763,7 +763,7 @@ static PyObject* pybullet_setPhysicsEngineParameter(PyObject* self, PyObject* ar
 	int maxNumCmdPer1ms = -2;
 	int enableFileCaching = -1;
 	double restitutionVelocityThreshold=-1;
-	double erp;
+	double erp = -1;
 	double contactERP = -1;
 	double frictionERP = -1;
 	b3PhysicsClientHandle sm = 0;