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

TileSet use texture Path instead of RID to prevent name conflicts. #38388

Merged
merged 1 commit into from
Feb 18, 2021
Merged

TileSet use texture Path instead of RID to prevent name conflicts. #38388

merged 1 commit into from
Feb 18, 2021

Conversation

mashumafi
Copy link
Contributor

@mashumafi mashumafi commented May 1, 2020

This fixes #35756 which occurs because certain textures such as Atlas uses the RID of the shared Texture instead generating a RID of it's own. This prevents 2 Atlas Textures that share Textures from being used in the same TileSet.
There was also some memory allocation for Lists that I removed along the way.

@mashumafi mashumafi changed the title Use texture Path instead of RID to prevent name conflicts. TileSet use texture Path instead of RID to prevent name conflicts. May 1, 2020
@Calinou Calinou added this to the 3.2 milestone Jan 5, 2021
@boruok
Copy link
Contributor

boruok commented Jan 30, 2021

@akien-mga any chance to merge pull to 3.2.4 RC2?

@akien-mga akien-mga requested review from groud and a team January 30, 2021 10:41
Copy link
Member

@KoBeWi KoBeWi left a comment

Choose a reason for hiding this comment

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

Looks ok.

@akien-mga akien-mga merged commit 48936dd into godotengine:3.2 Feb 18, 2021
@akien-mga
Copy link
Member

Thanks!

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.

5 participants