Merge remote-tracking branch 'bp/master'

This commit is contained in:
bla
2018-10-05 19:42:26 -07:00

View File

@@ -8605,6 +8605,7 @@ bool PhysicsServerCommandProcessor::processRemoveBodyCommand(const struct Shared
{ {
btMultiBodyWorldImporter* importer = m_data->m_worldImporters[foundIndex]; btMultiBodyWorldImporter* importer = m_data->m_worldImporters[foundIndex];
m_data->m_worldImporters.removeAtIndex(foundIndex); m_data->m_worldImporters.removeAtIndex(foundIndex);
importer->deleteAllData();
delete importer; delete importer;
m_data->m_userCollisionShapeHandles.freeHandle(removeCollisionShapeId); m_data->m_userCollisionShapeHandles.freeHandle(removeCollisionShapeId);
serverCmd.m_type = CMD_REMOVE_BODY_COMPLETED; serverCmd.m_type = CMD_REMOVE_BODY_COMPLETED;