Merge remote-tracking branch 'bp/master'

This commit is contained in:
erwincoumans
2016-10-12 23:07:41 -07:00
2 changed files with 31 additions and 18 deletions

View File

@@ -615,16 +615,27 @@ const SharedMemoryStatus* PhysicsClientSharedMemory::processServerStatus() {
b3Warning("Contact Point Information Request failed");
break;
}
case CMD_SAVE_WORLD_COMPLETED:
break;
case CMD_SAVE_WORLD_COMPLETED:
break;
case CMD_SAVE_WORLD_FAILED:
{
b3Warning("Saving world failed");
break;
}
{
b3Warning("Saving world failed");
break;
}
case CMD_CALCULATE_INVERSE_KINEMATICS_COMPLETED:
{
break;
}
case CMD_CALCULATE_INVERSE_KINEMATICS_FAILED:
{
b3Warning("Calculate Inverse Kinematics Request failed");
break;
}
default: {
b3Error("Unknown server status\n");
b3Error("Unknown server status %d\n", serverCmd.m_type);
btAssert(0);
}
};