Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-07 13:49:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #113622 from mihe/jolt/no-nested-mt-flushes

Browse source 
Remove call to `PhysicsServer3D` from Jolt Physics implementation
This commit is contained in:
Rémi Verschelde 2025-12-05 14:21:06 +01:00
commit dec5a373d9
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/jolt_physics/joints/jolt_joint_3d.cpp
View file

@ -30,6 +30,7 @@
#include "jolt_joint_3d.h" #include "jolt_joint_3d.h"
#include "../jolt_physics_server_3d.h"
#include "../jolt_project_settings.h" #include "../jolt_project_settings.h"
#include "../misc/jolt_type_conversions.h" #include "../misc/jolt_type_conversions.h"
#include "../objects/jolt_body_3d.h" #include "../objects/jolt_body_3d.h"
@ -209,7 +210,7 @@ void JoltJoint3D::set_collision_disabled(bool p_disabled) {
return; return;
} }
PhysicsServer3D *physics_server = PhysicsServer3D::get_singleton(); JoltPhysicsServer3D *physics_server = JoltPhysicsServer3D::get_singleton();
if (collision_disabled) { if (collision_disabled) {
physics_server->body_add_collision_exception(body_a->get_rid(), body_b->get_rid()); physics_server->body_add_collision_exception(body_a->get_rid(), body_b->get_rid());