TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-06-14 17:34:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'GarageGames/master' into ueberengine-dev

Browse source 
Conflicts:
	Engine/source/windowManager/sdl/sdlWindowMgr.cpp
	Tools/CMake/torque3d.cmake

3.10 final update
This commit is contained in:
Duion 2017-03-23 20:36:21 +01:00
commit aff033dd0d
1003 changed files with 53039 additions and 82707 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/T3D/decal/decalManager.cpp
View file

@ -632,9 +632,9 @@ DecalInstance* DecalManager::getClosestDecal( const Point3F &pos )
}
}
if ( !collectedInsts.empty() &&
if ( (!collectedInsts.empty() &&
collectedInsts[closestIndex] &&
closestDistance < 1.0f ||
closestDistance < 1.0f) ||
worldInstSphere.isContained( pos ) )
return collectedInsts[closestIndex];
else