Merge commit '4241ee5dfab99d4e247624a2f368a8a931d2e54c' into bigmerge

avinationmerge
Melanie 2011-10-25 03:18:10 +01:00
commit 0531b73695
1 changed files with 3 additions and 5 deletions

View File

@ -2811,16 +2811,14 @@ Console.WriteLine("AddPhysicsActorTaint to " + taintedprim.Name);
}
}
//if (m_global_contactcount > 5)
//{
// m_log.DebugFormat("[PHYSICS]: Contacts:{0}", m_global_contactcount);
//}
// if (m_global_contactcount > 0)
// m_log.DebugFormat(
// "[PHYSICS]: Collision contacts to process this frame = {0}", m_global_contactcount);
m_global_contactcount = 0;
d.WorldQuickStep(world, ODE_STEPSIZE);
d.JointGroupEmpty(contactgroup);
//ode.dunlock(world);
}
catch (Exception e)
{