Merge pull request #515 from erwincoumans/master

remove debug test
This commit is contained in:
erwincoumans
2015-11-05 17:35:46 -08:00

View File

@@ -795,11 +795,9 @@ void PhysicsServerSharedMemory::createJointMotors(btMultiBody* mb)
bool PhysicsServerSharedMemory::loadUrdf(const char* fileName2, const btVector3& pos, const btQuaternion& orn,
bool PhysicsServerSharedMemory::loadUrdf(const char* fileName, const btVector3& pos, const btQuaternion& orn,
bool useMultiBody, bool useFixedBase, int* bodyUniqueIdPtr)
{
const char* fileName="tmp/model/simulation/model_s_one_s15p1.urdf";
btAssert(m_data->m_dynamicsWorld);
if (!m_data->m_dynamicsWorld)
{
@@ -1917,4 +1915,4 @@ void PhysicsServerSharedMemory::replayFromLogFile(const char* fileName)
{
CommandLogPlayback* pb = new CommandLogPlayback(fileName);
m_data->m_logPlayback = pb;
}
}