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

Cherry-picks for the 3.5 branch (future 3.5.2) - 1st batch #69589

Merged
merged 57 commits into from
Dec 5, 2022

Conversation

timothyqiu
Copy link
Member

@kleonc noted in #66063:

Marking for cherry-pick as it's a bugfix but note it's possible that some users use these only in 3D and thus they could have setup things according to the previous buggy behavior. Meaning if someone uses AtlasTextures with vertical margins (so I'd guess not so common case) and has tweaked some settings (like offset etc.) to make it look visually according to their needs then this PR will break things for them (they would need to change their setup). So it should be clearly pointed out in the change log if cherry-picked.

timothyqiu and others added 30 commits December 5, 2022 09:15
Running `gradlew clean` will now properly delete the generated build artifacts

(cherry picked from commit 71c76a4)
(cherry picked from commit b381275)
Co-Authored-By: Sean <sean@geekotron.net>
(cherry picked from commit 37ccdb2)
(cherry picked from commit d038666)
Co-authored-by: Haoyu Qiu <timothyqiu32@gmail.com>
(cherry picked from commit 9ea2ef7)
akien-mga and others added 3 commits December 5, 2022 10:10
Instantiating a new ProjectSettings is *not* the way to go.
ConfigFile works just fine to read/change a single value.

Fixes memory leaks as the instantiated ProjectSettings was never freed.
Forbid doing this to prevent such problems.

Fixes godotengine#25661.

(cherry picked from commit f21f75e)
Only import dependency we know how to import, since custom resource may have .gd in dependency list which doesn't have an importer

(cherry picked from commit 0463a44)
@akien-mga akien-mga merged commit c764797 into godotengine:3.5 Dec 5, 2022
@akien-mga
Copy link
Member

Thanks!

@timothyqiu timothyqiu deleted the 3.5-cherrypicks branch December 5, 2022 06:52
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.