Skip to content

godot
godot
Unverified Commit 58034f39 by Rémi Verschelde Committed by GitHub
Options

Merge pull request #39505 from madmiraal/fix-39500

Ensure pair callback data is set to null when it's null.
parents 84abf5a9 62142c54
Showing with 1 addition and 4 deletions
servers/physics_2d/broad_phase_2d_hash_grid.cpp
......@@ -75,10 +75,7 @@ void BroadPhase2DHashGrid::_check_motion(Element *p_elem) {
if (pairing != E->get()->colliding) {
if (pairing) {
if (pair_callback) {
void *ud = pair_callback(p_elem->owner, p_elem->subindex, E->key()->owner, E->key()->subindex, pair_userdata);
if (ud) {
E->get()->ud = ud;
}
E->get()->ud = pair_callback(p_elem->owner, p_elem->subindex, E->key()->owner, E->key()->subindex, pair_userdata);
}
} else {
if (unpair_callback) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment