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
diff options
context:
space:
mode:
Diffstat (limited to 'extern/bullet2/src/BulletCollision/Gimpact/gim_tri_collision.h')
-rw-r--r--extern/bullet2/src/BulletCollision/Gimpact/gim_tri_collision.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/extern/bullet2/src/BulletCollision/Gimpact/gim_tri_collision.h b/extern/bullet2/src/BulletCollision/Gimpact/gim_tri_collision.h
index 7cea8fc33a6..2d6e43a1a2e 100644
--- a/extern/bullet2/src/BulletCollision/Gimpact/gim_tri_collision.h
+++ b/extern/bullet2/src/BulletCollision/Gimpact/gim_tri_collision.h
@@ -36,9 +36,6 @@ email: projectileman@yahoo.com
#include "gim_box_collision.h"
#include "gim_clip_polygon.h"
-/*! \addtogroup GEOMETRIC_OPERATIONS
-*/
-//! @{
@@ -278,7 +275,7 @@ if 0.0<= u+v <=1.0 then they are inside of triangle
}
else
{
- float sumuv;
+ btScalar sumuv;
sumuv = u+v;
if(sumuv<-G_EPSILON)
{
@@ -378,6 +375,5 @@ if 0.0<= u+v <=1.0 then they are inside of triangle
-//! @}
#endif // GIM_TRI_COLLISION_H_INCLUDED