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

Fix memory access error for MultiMesh with GLES3 #80788

Merged
merged 1 commit into from
Aug 21, 2023

Conversation

AThousandShips
Copy link
Member

@AThousandShips AThousandShips commented Aug 19, 2023

Buffer was incorrectly assigned when invalid data was provided

Can confirm the data is no longer garbled, but haven't got a sanitiser build to confirm it doesn't crash, as it doesn't crash for me with the original code

Can move it before the "make local" function if safe to save on processing but left it after for now

Edit: Can confirm this fixes memory issues, tested with set_instance_transform_2d which crashes on the old code but not the new

Buffer was incorrectly assigned when invalid data was provided
Copy link
Member

@clayjohn clayjohn left a comment

Choose a reason for hiding this comment

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

Looks good to me!

@clayjohn clayjohn added the cherrypick:4.1 Considered for cherry-picking into a future 4.1.x release label Aug 19, 2023
@akien-mga akien-mga merged commit 4e8bfe6 into godotengine:master Aug 21, 2023
15 checks passed
@akien-mga
Copy link
Member

Thanks!

@AThousandShips AThousandShips deleted the gl_multimesh branch August 21, 2023 08:49
@AThousandShips
Copy link
Member Author

Thank you!

@YuriSizov YuriSizov removed the cherrypick:4.1 Considered for cherry-picking into a future 4.1.x release label Sep 20, 2023
@YuriSizov
Copy link
Contributor

Cherry-picked for 4.1.2.

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.

Executing MultiMesh._get_transform_2d_array function in GLES3 crashes Godot
4 participants