Merge remote-tracking branch 'origin/physx' into physx_clean

2019-02-28 17:52:59 -08:00
parent 208b38c51f a9996088c8
commit 4d711ed411
17 changed files with 930 additions and 1780 deletions
--- a/examples/pybullet/pybullet.c
+++ b/examples/pybullet/pybullet.c
@@ -456,7 +456,7 @@ static PyObject* pybullet_connectPhysicsServer(PyObject* self, PyObject* args, P
 #ifdef BT_ENABLE_PHYSX
 			case eCONNECT_PHYSX:
 			{
-				sm = b3ConnectPhysX();
+				sm = b3ConnectPhysX(argc, argv);
 				break;
 			}
 #endif