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.

Sign up for GitHub

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

Jump to bottom

Fix pairing crash in physics Octree #70365

Merged
merged 1 commit into from
Dec 22, 2022
Merged

Fix pairing crash in physics Octree #70365

merged 1 commit into from
Dec 22, 2022

Conversation

lawnjelly
Copy link
Member

@lawnjelly lawnjelly commented Dec 20, 2022 •
edited
Loading

Remove section of code that should not run and was causing crash.

Fixes #70322

Notes

  • Regression caused by BVH templated mask checks and generic NUM_TREES #55640
  • The section of code previously passed nullptr to SpaceSW::_broadphase_pair in p_pair_data, this meant that the middle of the removed section never should have ran.
  • Only relevant in 3.x as we removed octree from 4.x

@lawnjelly
Fix pairing crash in physics Octree
6a2912c 
Remove section of code that should not run and was causing crash.
@lawnjelly lawnjelly requested a review from a team as a code owner December 20, 2022 19:30
@akien-mga akien-mga added bug topic:physics crash topic:3d cherrypick:3.5 Considered for cherry-picking into a future 3.5.x release labels Dec 20, 2022
@akien-mga akien-mga added this to the 3.6 milestone Dec 20, 2022
rburing
rburing approved these changes Dec 20, 2022
View reviewed changes
Copy link
Member

@rburing rburing left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hooray for backward compatibility in the 3.x branch!

@lawnjelly
Copy link
Member Author

That one user still using octree physics will be overjoyed! 😀

@akien-mga akien-mga merged commit 39edf7e into godotengine:3.x Dec 22, 2022
@akien-mga
Copy link
Member

Thanks!

@akien-mga akien-mga mentioned this pull request Dec 22, 2022
Closed
@lawnjelly lawnjelly deleted the octree_pairing_fix branch December 22, 2022 08:12
@akien-mga
Copy link
Member

Cherry-picked for 3.5.2.

@akien-mga akien-mga removed the cherrypick:3.5 Considered for cherry-picking into a future 3.5.x release label Dec 22, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@akien-mga akien-mga akien-mga approved these changes

@rburing rburing rburing approved these changes

Assignees
No one assigned
Labels
bug crash topic:physics topic:3d
Projects
None yet
Milestone
3.6
Development

Successfully merging this pull request may close these issues.
3 participants
@lawnjelly @akien-mga @rburing