Merge pull request #39505 from madmiraal/fix-39500

Ensure pair callback data is set to null when it's null.
godotengine · Jun 13, 2020 · 58034f3 · 58034f3
2 parents 84abf5a + 62142c5
commit 58034f3
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/servers/physics_2d/broad_phase_2d_hash_grid.cpp b/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) {