From cc20fc919b8f9d31a1e41516f7c71a2dc4df868b Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Mon, 2 Jun 2003 18:24:46 +0000
Subject: [PATCH] clear velocity on removed colliders also

---
 panda/src/collide/collisionTraverser.cxx | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/panda/src/collide/collisionTraverser.cxx b/panda/src/collide/collisionTraverser.cxx
index ee234f7a2f..82601bca6a 100644
--- a/panda/src/collide/collisionTraverser.cxx
+++ b/panda/src/collide/collisionTraverser.cxx
@@ -716,6 +716,12 @@ remove_handler(CollisionTraverser::Handlers::iterator hi) {
       
       nassertr(_ordered_colliders.size() == _colliders.size(), false);
 
+      if (auto_clear_velocity) {
+        // Clear the velocity on the removed node, to be consistent
+        // with nodes that were not removed.
+        node->clear_velocity();
+      }
+
     } else {
       // This collider references some other handler; keep it.
       ++ci;