From 4c84ebab2e97db1abc47261352d1e9dd72dc99ac Mon Sep 17 00:00:00 2001
From: Mikael Hermansson <mikael@hermansson.io>
Date: Fri, 13 Dec 2024 00:39:42 +0100
Subject: [PATCH] Make RID allocation thread-safe when using Jolt Physics

(cherry picked from commit f6126badbab82382847f777acecc7cc0a3a436dc)
---
 modules/jolt_physics/jolt_physics_server_3d.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/jolt_physics/jolt_physics_server_3d.h b/modules/jolt_physics/jolt_physics_server_3d.h
index a40653c9836..de7ce4d50fa 100644
--- a/modules/jolt_physics/jolt_physics_server_3d.h
+++ b/modules/jolt_physics/jolt_physics_server_3d.h
@@ -49,12 +49,12 @@ class JoltPhysicsServer3D final : public PhysicsServer3D {
 
 	inline static JoltPhysicsServer3D *singleton = nullptr;
 
-	mutable RID_PtrOwner<JoltSpace3D> space_owner;
-	mutable RID_PtrOwner<JoltArea3D> area_owner;
-	mutable RID_PtrOwner<JoltBody3D> body_owner;
-	mutable RID_PtrOwner<JoltSoftBody3D> soft_body_owner;
-	mutable RID_PtrOwner<JoltShape3D> shape_owner;
-	mutable RID_PtrOwner<JoltJoint3D> joint_owner;
+	mutable RID_PtrOwner<JoltSpace3D, true> space_owner;
+	mutable RID_PtrOwner<JoltArea3D, true> area_owner;
+	mutable RID_PtrOwner<JoltBody3D, true> body_owner;
+	mutable RID_PtrOwner<JoltSoftBody3D, true> soft_body_owner;
+	mutable RID_PtrOwner<JoltShape3D, true> shape_owner;
+	mutable RID_PtrOwner<JoltJoint3D, true> joint_owner;
 
 	HashSet<JoltSpace3D *> active_spaces;