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

Allow using CanvasItemMaterial in the TileSet editor #58544

Merged

Conversation

Calinou
Copy link
Member

@Calinou Calinou commented Feb 25, 2022

Previously, only ShaderMaterial overrides could be added.

Note: Not tested yet, I'll make a quick setup to make sure it works as expected.

This closes #58541.

@Calinou Calinou requested a review from a team as a code owner February 25, 2022 23:26
@Calinou Calinou added this to the 4.0 milestone Feb 25, 2022
@akien-mga
Copy link
Member

Remember to update docs.

@Calinou Calinou force-pushed the tileset-source-allow-canvasitemmaterial branch from a92057b to 49caba9 Compare February 25, 2022 23:43
@Calinou Calinou requested a review from a team as a code owner February 25, 2022 23:43
@Calinou
Copy link
Member Author

Calinou commented Feb 25, 2022

Remember to update docs.

Done. I haven't managed to create a testing project for this yet (I'm getting a bunch of errors trying to use a tileset image with only 1 tile).

doc/classes/TileData.xml Outdated Show resolved Hide resolved
Previously, only ShaderMaterial overrides could be added.
@Calinou Calinou force-pushed the tileset-source-allow-canvasitemmaterial branch from 49caba9 to b3fe273 Compare June 21, 2022 15:03
@akien-mga akien-mga merged commit 3ccff61 into godotengine:master Jun 22, 2022
@akien-mga
Copy link
Member

Thanks!

@Calinou Calinou deleted the tileset-source-allow-canvasitemmaterial branch June 22, 2022 21:32
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.

New TileSet material cannot be CanvasItemMaterial
3 participants