From 8ad4c8e23c3f3554ef2d43866530af3e3441920c Mon Sep 17 00:00:00 2001
From: deflected <deflected@users.noreply.github.com>
Date: Thu, 1 Mar 2018 23:16:37 +0200
Subject: [PATCH] bullet: Fixed deadlock when loading from collision solids

        - Fixed deadlock when loading ghost nodes from collision solids and
        have non-identity scale applied.

Signed-off-by: deflected <deflected@users.noreply.github.com>
---
 panda/src/bullet/bulletGhostNode.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/panda/src/bullet/bulletGhostNode.cxx b/panda/src/bullet/bulletGhostNode.cxx
index 39740ff5a1..14b693bda6 100644
--- a/panda/src/bullet/bulletGhostNode.cxx
+++ b/panda/src/bullet/bulletGhostNode.cxx
@@ -97,7 +97,7 @@ do_transform_changed() {
     if (ts->has_scale()) {
       LVecBase3 scale = ts->get_scale();
       if (!scale.almost_equal(LVecBase3(1.0f, 1.0f, 1.0f))) {
-        for (int i=0; i<get_num_shapes(); i++) {
+        for (int i=0; i < _shapes.size(); i++) {
           PT(BulletShape) shape = _shapes[i];
           shape->do_set_local_scale(scale);
         }