Skip to content

Commit b68675e

Browse files
committed
Merge pull request #100342 from mihe/jolt/thread-safe-rids
Make `RID` allocation thread-safe when using Jolt Physics
2 parents 6594a63 + f6126ba commit b68675e

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

modules/jolt_physics/jolt_physics_server_3d.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ class JoltPhysicsServer3D final : public PhysicsServer3D {
4747

4848
inline static JoltPhysicsServer3D *singleton = nullptr;
4949

50-
mutable RID_PtrOwner<JoltSpace3D> space_owner;
51-
mutable RID_PtrOwner<JoltArea3D> area_owner;
52-
mutable RID_PtrOwner<JoltBody3D> body_owner;
53-
mutable RID_PtrOwner<JoltSoftBody3D> soft_body_owner;
54-
mutable RID_PtrOwner<JoltShape3D> shape_owner;
55-
mutable RID_PtrOwner<JoltJoint3D> joint_owner;
50+
mutable RID_PtrOwner<JoltSpace3D, true> space_owner;
51+
mutable RID_PtrOwner<JoltArea3D, true> area_owner;
52+
mutable RID_PtrOwner<JoltBody3D, true> body_owner;
53+
mutable RID_PtrOwner<JoltSoftBody3D, true> soft_body_owner;
54+
mutable RID_PtrOwner<JoltShape3D, true> shape_owner;
55+
mutable RID_PtrOwner<JoltJoint3D, true> joint_owner;
5656

5757
HashSet<JoltSpace3D *> active_spaces;
5858

0 commit comments

Comments
 (0)