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

Fix crash in Jolt Physics when switching scenes in editor

Browse source 
Co-authored-by: Jorrit Rouwe <jrouwe@gmail.com>
This commit is contained in:
Mikael Hermansson 2025-06-28 21:45:58 +02:00
parent efb40c1524
commit e2985a2e1f
3 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
thirdparty/jolt_physics/Jolt/Physics/Collision/BroadPhase/BroadPhaseQuadTree.cpp vendored
View file

@ -73,6 +73,7 @@ void BroadPhaseQuadTree::Optimize()
{
JPH_PROFILE_FUNCTION();
// Free the previous tree so we can create a new optimized tree
FrameSync();
LockModifications();
@ -80,7 +81,7 @@ void BroadPhaseQuadTree::Optimize()
for (uint l = 0; l < mNumLayers; ++l)
{
QuadTree &tree = mLayers[l];
if (tree.HasBodies())
if (tree.HasBodies() || tree.IsDirty())
{
QuadTree::UpdateState update_state;
tree.UpdatePrepare(mBodyManager->GetBodies(), mTracking, update_state, true);
@ -90,6 +91,9 @@ void BroadPhaseQuadTree::Optimize()
UnlockModifications();
// Free the tree from before we created a new optimized tree
FrameSync();
mNextLayerToUpdate = 0;
}

2
thirdparty/jolt_physics/Jolt/Physics/Collision/BroadPhase/QuadTree.cpp vendored
View file

@ -301,7 +301,7 @@ void QuadTree::UpdatePrepare(const BodyVector &inBodies, TrackingVector &ioTrack
#endif
// Create space for all body ID's
NodeID *node_ids = new NodeID [mNumBodies];
NodeID *node_ids = mNumBodies > 0? new NodeID [mNumBodies] : nullptr;
NodeID *cur_node_id = node_ids;
// Collect all bodies