Remove call to PhysicsServer3D from Jolt Physics implementation#113622
Merged
akien-mga merged 1 commit intogodotengine:masterfrom Dec 5, 2025
Merged
Remove call to PhysicsServer3D from Jolt Physics implementation#113622akien-mga merged 1 commit intogodotengine:masterfrom
PhysicsServer3D from Jolt Physics implementation#113622akien-mga merged 1 commit intogodotengine:masterfrom
Conversation
akien-mga
approved these changes
Dec 5, 2025
Member
|
Thanks! |
This was referenced Dec 5, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #113620.
The Jolt Physics implementation of
PhysicsServer3D::joint_disable_collisions_between_bodiescurrently calls out toPhysicsServer3Dinside of it, by callingPhysicsServer3D::body_add_collision_exception. This seems to cause deadlocks as of #112506, for reasons that are currently unclear.However, there's no need to go through
PhysicsServer3D(and thusPhysicsServer3DWrapMT) since we'll always be on the server thread at this point anyway. Simply switching to useJoltPhysicsServer3Dresolves the problem.