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

Adds flag AMBIENT_LIGHT_DISABLED to GLES2 #28431

Merged
merged 1 commit into from Apr 29, 2019

Conversation

@SouzaGuilherme
Copy link
Contributor

SouzaGuilherme commented Apr 25, 2019

Closes #28171.

@SouzaGuilherme SouzaGuilherme requested a review from reduz as a code owner Apr 25, 2019
@@ -1542,6 +1542,11 @@ FRAGMENT_SHADER_CODE

#ifdef BASE_PASS
//none

#ifdef AMBIENT_LIGHT_DISABLED
ambient_light = vec3(0.0, 0.0, 0.0);

This comment has been minimized.

Copy link
@akien-mga

akien-mga Apr 25, 2019

Member

Style issue, indentation should use a tab. There's also a typo in the commit log, it should be GLES2.

This comment has been minimized.

Copy link
@SouzaGuilherme

SouzaGuilherme Apr 25, 2019

Author Contributor

Thank you, I will fix it accordingly.

@@ -1564,6 +1569,7 @@ FRAGMENT_SHADER_CODE

#endif

#endif

This comment has been minimized.

Copy link
@akien-mga

akien-mga Apr 25, 2019

Member

Could you add // AMBIENT_LIGHT_DISABLED to make the scope clear?

@akien-mga akien-mga added this to the 3.2 milestone Apr 25, 2019
@SouzaGuilherme SouzaGuilherme force-pushed the SouzaGuilherme:master branch from e48cb10 to 94e96c0 Apr 25, 2019
Signed-off-by: Guilherme Souza <gdsdsilva@inf.ufpel.edu.br>
@SouzaGuilherme SouzaGuilherme force-pushed the SouzaGuilherme:master branch from 94e96c0 to 61a844a Apr 25, 2019
@SouzaGuilherme SouzaGuilherme changed the title Adds flag AMBIENT_LIGHT_DISABLED to GLAS2 Adds flag AMBIENT_LIGHT_DISABLED to GLES2 Apr 25, 2019
@akien-mga akien-mga merged commit a3617f6 into godotengine:master Apr 29, 2019
2 checks passed
2 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@akien-mga

This comment has been minimized.

Copy link
Member

akien-mga commented Apr 29, 2019

Thanks!

@akien-mga

This comment has been minimized.

Copy link
Member

akien-mga commented Jul 17, 2019

Cherry-picked for 3.1.2.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.