Merge pull request #39504 from madmiraal/fix-39500-3.2
[3.2] Ensure pair callback data is set to null when it's null.
This commit is contained in:
commit
879014c3ff
1 changed files with 1 additions and 4 deletions
|
@ -83,10 +83,7 @@ void BroadPhase2DHashGrid::_check_motion(Element *p_elem) {
|
|||
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 {
|
||||
|
||||
|
|
Loading…
Reference in a new issue