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 eed9c1c511
56 changed files with 317 additions and 8496 deletions

View file

@ -307,7 +307,7 @@ void SceneContainer::insertIntoBins(SceneObject* obj,
// For huge objects, dump them into the overflow bin. Otherwise, everything
// goes into the grid...
//
if ((maxX - minX + 1) < csmNumBins || (maxY - minY + 1) < csmNumBins && !obj->isGlobalBounds())
if ((maxX - minX + 1) < csmNumBins || ((maxY - minY + 1) < csmNumBins && !obj->isGlobalBounds()))
{
SceneObjectRef** pCurrInsert = &obj->mBinRefHead;