From 7949f31c3e2cb043d9d5012ee6ee70886e74d96a Mon Sep 17 00:00:00 2001 From: erwincoumans Date: Sun, 8 Apr 2018 21:30:06 -0700 Subject: [PATCH] fixes in btMiniSDF --- src/BulletCollision/CollisionShapes/btMiniSDF.cpp | 2 +- src/BulletCollision/CollisionShapes/btMiniSDF.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/BulletCollision/CollisionShapes/btMiniSDF.cpp b/src/BulletCollision/CollisionShapes/btMiniSDF.cpp index f11daee12..968830062 100644 --- a/src/BulletCollision/CollisionShapes/btMiniSDF.cpp +++ b/src/BulletCollision/CollisionShapes/btMiniSDF.cpp @@ -2,7 +2,7 @@ #include "LinearMath/btAlignedObjectArray.h" - +#include //memcpy struct btSdfDataStream { diff --git a/src/BulletCollision/CollisionShapes/btMiniSDF.h b/src/BulletCollision/CollisionShapes/btMiniSDF.h index 221b3494e..51985d33b 100644 --- a/src/BulletCollision/CollisionShapes/btMiniSDF.h +++ b/src/BulletCollision/CollisionShapes/btMiniSDF.h @@ -79,7 +79,7 @@ struct btShapeGradients } } - inline double& operator()(int i, int j) + inline btScalar& operator()(int i, int j) { return m_vec[i][j]; }