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

Batching - GLES3 fix light pass modulates #48151

Merged
merged 1 commit into from
Apr 24, 2021

Conversation

lawnjelly
Copy link
Member

The final_modulate was incorrectly being set in the uniform on light passes in GLES3 in situations where color was baked in the vertices. This was already correct in GLES2. This PR makes prevents setting final_modulate in this situation.

Fixes #48122

Notes

  • After fixing this in GLES3 I noticed the exact same fix was already applied in GLES2, which makes me more confident it is the correct fix. I must have fixed GLES2 before unified batching, or forgotten to do the GLES3 version at the time.

The final_modulate was incorrectly being set in the uniform on light passes in GLES3 in situations where color was baked in the vertices. This was already correct in GLES2. This PR makes prevents setting final_modulate in this situation.
@akien-mga akien-mga merged commit 5942a70 into godotengine:3.x Apr 24, 2021
@akien-mga
Copy link
Member

Thanks!

@akien-mga
Copy link
Member

Cherry-picked for 3.3.1.

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