Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[3.x] Godot Physics AreaSW and Area2DSW: fix premature return in call_queries #58531

Merged

Conversation

rburing
Copy link
Member

@rburing rburing commented Feb 25, 2022

The call_queries method (of AreaSW and of Area2DSW) does two things: one for monitored bodies and one for monitored areas. However, if the null check in the part about bodies fails, then the method returned, and hence skipped the part about areas (which is an independent part).

This PR fixes the premature return, by bringing the structure of the code in sync with master (compare e.g. GodotArea2D::call_queries() in master). Hence this PR is only for 3.x and not relevant for master.

@rburing rburing requested a review from a team as a code owner February 25, 2022 13:43
@akien-mga akien-mga added this to the 3.5 milestone Feb 25, 2022
@akien-mga akien-mga merged commit 6ca309e into godotengine:3.x Feb 26, 2022
@akien-mga
Copy link
Member

Thanks!

@rburing rburing deleted the area_call_queries_fix_premature_return branch February 26, 2022 08:37
@akien-mga
Copy link
Member

Cherry-picked for 3.4.4.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants