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

Add AtlasTexture support in SpriteFrames Editor #37939

Conversation

MrRevington
Copy link
Contributor

This adds support for AtlasTexture in the SpriteFrames Editor for the "Add Frames from a Sprite Sheet" option by honoring the used region if the selected Texture is an AtlasTexture.

This fixes the issue mentioned in comment #33855 (comment)

@MrRevington MrRevington force-pushed the SpriteFramesEditoAtlasTextureSupport branch 2 times, most recently from c1eb2ec to ed5cef8 Compare April 16, 2020 17:45
@Calinou Calinou added this to the 4.0 milestone Apr 16, 2020
@Calinou Calinou added the cherrypick:3.x Considered for cherry-picking into a future 3.x release label Apr 16, 2020
@akien-mga
Copy link
Member

The code looks good, I just suggested some stylistic changes which you can do with git commit --amend to keep it all in one commit.

@MrRevington MrRevington force-pushed the SpriteFramesEditoAtlasTextureSupport branch from ed5cef8 to 13770ac Compare April 30, 2020 21:31
@MrRevington
Copy link
Contributor Author

should be fine now, thanks akien-mga!

@akien-mga akien-mga merged commit 13aff53 into godotengine:master May 1, 2020
@akien-mga
Copy link
Member

Thanks!

@akien-mga
Copy link
Member

Cherry-picked for 3.2.2.

@akien-mga akien-mga removed the cherrypick:3.x Considered for cherry-picking into a future 3.x release label May 1, 2020
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