From 0722400f338e3a50c9a7015367ca1df7f6f58f33 Mon Sep 17 00:00:00 2001 From: erwincoumans Date: Mon, 9 Sep 2019 20:39:53 -0700 Subject: [PATCH 1/3] Update btConjugateGradient.h add ; to btAssert --- src/BulletSoftBody/btConjugateGradient.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/BulletSoftBody/btConjugateGradient.h b/src/BulletSoftBody/btConjugateGradient.h index c20a8ae5d..eee3ea52e 100644 --- a/src/BulletSoftBody/btConjugateGradient.h +++ b/src/BulletSoftBody/btConjugateGradient.h @@ -100,7 +100,7 @@ public: TVStack sub(const TVStack& a, const TVStack& b) { // c = a-b - btAssert(a.size() == b.size()) + btAssert(a.size() == b.size()); TVStack c; c.resize(a.size()); for (int i = 0; i < a.size(); ++i) @@ -126,7 +126,7 @@ public: void multAndAddTo(btScalar s, const TVStack& a, TVStack& result) { // result += s*a - btAssert(a.size() == result.size()) + btAssert(a.size() == result.size()); for (int i = 0; i < a.size(); ++i) result[i] += s * a[i]; } From 0d4db1a6f2203eb17ab31fa0e127c7b26bcdbbf1 Mon Sep 17 00:00:00 2001 From: erwincoumans Date: Mon, 9 Sep 2019 20:41:42 -0700 Subject: [PATCH 2/3] Update btDeformableMassSpringForce.h --- src/BulletSoftBody/btDeformableMassSpringForce.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/BulletSoftBody/btDeformableMassSpringForce.h b/src/BulletSoftBody/btDeformableMassSpringForce.h index a85dd547a..73d7efb42 100644 --- a/src/BulletSoftBody/btDeformableMassSpringForce.h +++ b/src/BulletSoftBody/btDeformableMassSpringForce.h @@ -45,7 +45,7 @@ public: virtual void addScaledDampingForce(btScalar scale, TVStack& force) { int numNodes = getNumNodes(); - btAssert(numNodes <= force.size()) + btAssert(numNodes <= force.size()); for (int i = 0; i < m_softBodies.size(); ++i) { const btSoftBody* psb = m_softBodies[i]; @@ -77,7 +77,7 @@ public: virtual void addScaledElasticForce(btScalar scale, TVStack& force) { int numNodes = getNumNodes(); - btAssert(numNodes <= force.size()) + btAssert(numNodes <= force.size()); for (int i = 0; i < m_softBodies.size(); ++i) { const btSoftBody* psb = m_softBodies[i]; From 66fc3a9ce94cbf9793898d9ebb11dec587670ada Mon Sep 17 00:00:00 2001 From: erwincoumans Date: Mon, 9 Sep 2019 20:42:21 -0700 Subject: [PATCH 3/3] Update btDeformableGravityForce.h --- src/BulletSoftBody/btDeformableGravityForce.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BulletSoftBody/btDeformableGravityForce.h b/src/BulletSoftBody/btDeformableGravityForce.h index 14d49ec1e..6fd53144a 100644 --- a/src/BulletSoftBody/btDeformableGravityForce.h +++ b/src/BulletSoftBody/btDeformableGravityForce.h @@ -53,7 +53,7 @@ public: virtual void addScaledGravityForce(btScalar scale, TVStack& force) { int numNodes = getNumNodes(); - btAssert(numNodes <= force.size()) + btAssert(numNodes <= force.size()); for (int i = 0; i < m_softBodies.size(); ++i) { btSoftBody* psb = m_softBodies[i];