From 2d3592e3673a493eb6d9b14e7b3b2ae7423b4186 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Wed, 7 May 2014 15:58:00 -0700
Subject: [PATCH] avoid resolving penetration twice

---
 interface/src/avatar/MyAvatar.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 50d9c4cef2..08cdca2a25 100644
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -994,8 +994,9 @@ void MyAvatar::updateCollisionWithVoxels(float deltaTime, float radius) {
                 } else {
                     totalPenetration = addPenetrations(totalPenetration, collision->_penetration);
                 }
+            } else {
+                totalPenetration = addPenetrations(totalPenetration, collision->_penetration);
             }
-            totalPenetration = addPenetrations(totalPenetration, collision->_penetration);
         }
         applyHardCollision(totalPenetration, VOXEL_ELASTICITY, VOXEL_DAMPING);
         _wasStuck = isStuck;