Merge branch 'development' of github.com:GarageGames/Torque3D

This commit is contained in:
Thomas "elfprince13" Dickerson 2017-01-06 22:52:04 -05:00
commit e2c61e1eb4
56 changed files with 317 additions and 8496 deletions

View file

@ -1043,9 +1043,9 @@ NavMesh *AIPlayer::findNavMesh() const
}
else
{
if(getNavSize() == Small && !m->mSmallCharacters ||
getNavSize() == Regular && !m->mRegularCharacters ||
getNavSize() == Large && !m->mLargeCharacters)
if((getNavSize() == Small && !m->mSmallCharacters) ||
(getNavSize() == Regular && !m->mRegularCharacters) ||
(getNavSize() == Large && !m->mLargeCharacters))
continue;
}
if(!mesh || m->getWorldBox().getVolume() < mesh->getWorldBox().getVolume())