From c6cde2d412833ea0e6bdaf06c54c608d8572843a Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Mon, 5 Nov 2018 11:13:32 -0800
Subject: [PATCH] don't assign null Shape to RigidBody already in physics
 simulation

---
 libraries/physics/src/ObjectMotionState.cpp | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/libraries/physics/src/ObjectMotionState.cpp b/libraries/physics/src/ObjectMotionState.cpp
index c814140930..acfb0c9236 100644
--- a/libraries/physics/src/ObjectMotionState.cpp
+++ b/libraries/physics/src/ObjectMotionState.cpp
@@ -305,15 +305,16 @@ bool ObjectMotionState::handleHardAndEasyChanges(uint32_t& flags, PhysicsEngine*
                 }
                 return true;
             }
-        }
-        if (_shape == newShape) {
-            // the shape didn't actually change, so we clear the DIRTY_SHAPE flag
-            flags &= ~Simulation::DIRTY_SHAPE;
-            // and clear the reference we just created
-            getShapeManager()->releaseShape(_shape);
         } else {
-            _body->setCollisionShape(const_cast<btCollisionShape*>(newShape));
-            setShape(newShape);
+            if (_shape == newShape) {
+                // the shape didn't actually change, so we clear the DIRTY_SHAPE flag
+                flags &= ~Simulation::DIRTY_SHAPE;
+                // and clear the reference we just created
+                getShapeManager()->releaseShape(_shape);
+            } else {
+                _body->setCollisionShape(const_cast<btCollisionShape*>(newShape));
+                setShape(newShape);
+            }
         }
     }
     if (flags & EASY_DIRTY_PHYSICS_FLAGS) {