TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-24 05:45:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update to bullet 2.87

Browse source
This commit is contained in:
Johxz 2018-02-04 21:49:50 -06:00
parent cfbdf63cd7
commit 8de2bf807f
153 changed files with 6111 additions and 3756 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp
View file

@ -776,7 +776,7 @@ int btGeneric6DofConstraint::get_limit_motor_info2(
btConstraintInfo2 *info, int row, btVector3& ax1, int rotational,int rotAllowed)
{
int srow = row * info->rowskip;
int powered = limot->m_enableMotor;
bool powered = limot->m_enableMotor;
int limit = limot->m_currentLimit;
if (powered || limit)
{ // if the joint is powered, or has joint limits, add in the extra row
@ -840,7 +840,7 @@ int btGeneric6DofConstraint::get_limit_motor_info2(
}
// if we're limited low and high simultaneously, the joint motor is
// ineffective
if (limit && (limot->m_loLimit == limot->m_hiLimit)) powered = 0;
if (limit && (limot->m_loLimit == limot->m_hiLimit)) powered = false;
info->m_constraintError[srow] = btScalar(0.f);
if (powered)
{