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

Hash ORM flag in BaseMaterial to differentiate between ORM and Standard materials #77969

Merged
merged 1 commit into from Jun 8, 2023

Conversation

clayjohn
Copy link
Member

@clayjohn clayjohn commented Jun 7, 2023

Along with #77810, fixes #77659

The material key is used to cache variations of the BaseMaterial. i.e. there should be a unique key for each variation of shader code. Accordingly, any property which changes the generated shader code needs to be contained in the flag. Since orm changes the generated code, it needs to be factored into the key.

@clayjohn clayjohn added this to the 4.1 milestone Jun 7, 2023
@akien-mga akien-mga merged commit fad6167 into godotengine:master Jun 8, 2023
13 checks passed
@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.

ORM Material broken with WorldEnvironment energy multiplier animation
2 participants