Bart/bullet3
1
0 Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed failed git merge

Browse Source
This commit is contained in:
erwincoumans committed 2019-02-18 18:34:11 -08:00
1 parent bdf9b10246
commit 33619893c7
1 file changed
-1
Download Patch File Download Diff File Expand all files Collapse all files
examples/SharedMemory/PhysicsServerCommandProcessor.cpp
-1
View File
@@ -7653,7 +7653,6 @@ bool PhysicsServerCommandProcessor::processChangeDynamicsInfoCommand(const struc
{ {
mb->setCanSleep(false); mb->setCanSleep(false);
} }
}
if (clientCmd.m_changeDynamicsInfoArgs.m_activationState & eActivationStateEnableWakeup) if (clientCmd.m_changeDynamicsInfoArgs.m_activationState & eActivationStateEnableWakeup)
{ {
mb->setCanWakeup(true); mb->setCanWakeup(true);