From 1e28e234c5b85ca5ada08a17ffdba10d26af2924 Mon Sep 17 00:00:00 2001
From: Marcel Admiraal <madmiraal@users.noreply.github.com>
Date: Tue, 6 Apr 2021 18:33:30 +0100
Subject: [PATCH] Check for the use of an empty shape in Bullet Kinematic
 collisions

(cherry picked from commit ff9a6c4e39b53269f7c6274994dee4f1bff29dbd)
---
 modules/bullet/space_bullet.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/bullet/space_bullet.cpp b/modules/bullet/space_bullet.cpp
index 1a5f33b98a5..a621ba78d29 100644
--- a/modules/bullet/space_bullet.cpp
+++ b/modules/bullet/space_bullet.cpp
@@ -1273,6 +1273,10 @@ bool SpaceBullet::recover_from_penetration(RigidBodyBullet *p_body, const btTran
 			continue;
 		}
 
+		if (kin_shape.shape->getShapeType() == EMPTY_SHAPE_PROXYTYPE) {
+			continue;
+		}
+
 		btTransform shape_transform = p_body_position * kin_shape.transform;
 		shape_transform.getOrigin() += r_delta_recover_movement;