From 5992651c278e7e911525a3c9253dad13571163c1 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Tue, 22 Apr 2014 20:55:28 -0700
Subject: [PATCH] update avatar collision shapes when necessary

---
 interface/src/avatar/MyAvatar.cpp | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index c5639d5f00..e1d7463aa3 100644
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -335,15 +335,17 @@ void MyAvatar::simulate(float deltaTime) {
             radius = myCamera->getAspectRatio() * (myCamera->getNearClip() / cos(myCamera->getFieldOfView() / 2.0f));
             radius *= COLLISION_RADIUS_SCALAR;
         }
-
-        if (_collisionFlags & COLLISION_GROUP_ENVIRONMENT) {
-            updateCollisionWithEnvironment(deltaTime, radius);
-        }
-        if (_collisionFlags & COLLISION_GROUP_VOXELS) {
-            updateCollisionWithVoxels(deltaTime, radius);
-        }
-        if (_collisionFlags & COLLISION_GROUP_AVATARS) {
-            updateCollisionWithAvatars(deltaTime);
+        if (_collisionFlags) {
+            updateShapePositions();
+            if (_collisionFlags & COLLISION_GROUP_ENVIRONMENT) {
+                updateCollisionWithEnvironment(deltaTime, radius);
+            }
+            if (_collisionFlags & COLLISION_GROUP_VOXELS) {
+                updateCollisionWithVoxels(deltaTime, radius);
+            }
+            if (_collisionFlags & COLLISION_GROUP_AVATARS) {
+                updateCollisionWithAvatars(deltaTime);
+            }
         }
     }
 
@@ -914,7 +916,6 @@ void MyAvatar::updateCollisionWithAvatars(float deltaTime) {
         // no need to compute a bunch of stuff if we have one or fewer avatars
         return;
     }
-    updateShapePositions();
     float myBoundingRadius = getBoundingRadius();
 
     const float BODY_COLLISION_RESOLUTION_FACTOR = glm::max(1.0f, deltaTime / BODY_COLLISION_RESOLUTION_TIMESCALE);