|
@@ -960,7 +960,8 @@ void RigidBody::_reload_physics_characteristics() {
|
|
|
Ref<KinematicCollision> KinematicBody::_move(const Vector3 &p_motion, bool p_infinite_inertia, bool p_exclude_raycast_shapes, bool p_test_only) {
|
|
|
Collision col;
|
|
|
if (move_and_collide(p_motion, p_infinite_inertia, col, p_exclude_raycast_shapes, p_test_only)) {
|
|
|
- if (motion_cache.is_null()) {
|
|
|
+ // Create a new instance when the cached reference is invalid or still in use in script.
|
|
|
+ if (motion_cache.is_null() || motion_cache->reference_get_count() > 1) {
|
|
|
motion_cache.instance();
|
|
|
motion_cache->owner = this;
|
|
|
}
|
|
@@ -1330,7 +1331,8 @@ Ref<KinematicCollision> KinematicBody::_get_slide_collision(int p_bounce) {
|
|
|
slide_colliders.resize(p_bounce + 1);
|
|
|
}
|
|
|
|
|
|
- if (slide_colliders[p_bounce].is_null()) {
|
|
|
+ // Create a new instance when the cached reference is invalid or still in use in script.
|
|
|
+ if (slide_colliders[p_bounce].is_null() || slide_colliders[p_bounce]->reference_get_count() > 1) {
|
|
|
slide_colliders.write[p_bounce].instance();
|
|
|
slide_colliders.write[p_bounce]->owner = this;
|
|
|
}
|