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

@ -25,7 +25,7 @@ namespace G3D {
#pragma float_control( precise, off )
#endif
bool Intersect::rayAABox(const Ray& ray, const AABox& box) {
bool __fastcall Intersect::rayAABox(const Ray& ray, const AABox& box) {
switch (ray.classification) {
case Ray::MMM:
@ -331,7 +331,7 @@ bool Intersect::rayAABox(const Ray& ray, const AABox& box) {
}
bool Intersect::rayAABox(const Ray& ray, const AABox& box, float& time) {
bool __fastcall Intersect::rayAABox(const Ray& ray, const AABox& box, float& time) {
switch (ray.classification) {
case Ray::MMM: