Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/extern
diff options
context:
space:
mode:
authorErwin Coumans <blender@erwincoumans.com>2006-05-11 06:14:48 +0400
committerErwin Coumans <blender@erwincoumans.com>2006-05-11 06:14:48 +0400
commit66f0950d34d16d21d2457a7a38eb05b5c70658c4 (patch)
treefde0b673faebbf51a218c07c1c85ed7c8beb440c /extern
parent93c47e107198c91ad28d72acc2c6659d862e496e (diff)
fixed raycasting related issue
Diffstat (limited to 'extern')
-rw-r--r--extern/bullet/Bullet/CollisionDispatch/CollisionWorld.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/extern/bullet/Bullet/CollisionDispatch/CollisionWorld.h b/extern/bullet/Bullet/CollisionDispatch/CollisionWorld.h
index c83192d9d2f..22e82082c65 100644
--- a/extern/bullet/Bullet/CollisionDispatch/CollisionWorld.h
+++ b/extern/bullet/Bullet/CollisionDispatch/CollisionWorld.h
@@ -125,9 +125,10 @@ public:
virtual float AddSingleResult(const LocalRayResult& rayResult)
{
- //caller already does the filter on the m_closestHitFraction
- assert(rayResult.m_hitFraction < m_closestHitFraction);
+//caller already does the filter on the m_closestHitFraction
+ assert(rayResult.m_hitFraction <= m_closestHitFraction);
+
m_closestHitFraction = rayResult.m_hitFraction;
m_collisionObject = rayResult.m_collisionObject;
m_hitNormalWorld = m_collisionObject->m_worldTransform.getBasis()*rayResult.m_hitNormalLocal;