From 92a612a14618af6d0204c2247eecf25570988d96 Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Fri, 5 Jun 2015 16:43:17 -0700 Subject: [PATCH] fix in btSoftBodyInternals.h to avoid infinite recursion 'getMargin' but call base class instead --- src/BulletSoftBody/btSoftBodyInternals.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BulletSoftBody/btSoftBodyInternals.h b/src/BulletSoftBody/btSoftBodyInternals.h index 19d0543ef..759509a1d 100644 --- a/src/BulletSoftBody/btSoftBodyInternals.h +++ b/src/BulletSoftBody/btSoftBodyInternals.h @@ -161,7 +161,7 @@ public: } virtual btScalar getMargin() const { - return getMargin(); + return btConvexInternalShape::getMargin(); } };