godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-16 14:00:40 +00:00
Code Releases Wiki Activity

Fix pairing crash in physics Octree

Browse Source 
Remove section of code that should not run and was causing crash.
This commit is contained in:
lawnjelly
2022-12-20 19:25:34 +00:00
parent 3428bcd854
commit 6a2912c856
1 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
servers/physics/broad_phase_octree.cpp
View File

@@ -85,19 +85,6 @@ void *BroadPhaseOctree::_pair_callback(void *self, OctreeElementID p_A, Collisio
} }
bool valid_collision_pair = p_object_A->test_collision_mask(p_object_B); bool valid_collision_pair = p_object_A->test_collision_mask(p_object_B);
void *pair_data = bpo->pair_userdata;
if (pair_data) {
// Checking an existing pair.
if (valid_collision_pair) {
// Nothing to do, pair is still valid.
return pair_data;
} else {
// Logical collision not valid anymore, unpair.
_unpair_callback(self, p_A, p_object_A, subindex_A, p_B, p_object_B, subindex_B, pair_data);
return nullptr;
}
}
if (!valid_collision_pair) { if (!valid_collision_pair) {
return nullptr; return nullptr;