Some missing from merge.

Signed-off-by: Salja <salja2012@hotmail.de>
This commit is contained in:
Salja 2012-08-05 14:54:07 +02:00 committed by Antz
parent ec939a5bce
commit f4be15a7af
1895 changed files with 160408 additions and 53601 deletions

View file

@ -885,7 +885,7 @@ float CollisionDetection::collisionTimeForMovingPointFixedPlane(
}
}
bool CollisionDetection::rayAABox(
bool __fastcall CollisionDetection::rayAABox(
const Ray& ray,
const Vector3& invDir,
const AABox& box,