Skip to content

Commit 0564019

Browse files
committed
Merge pull request #107928 from Kaleb-Reid/scatter-no-LIGHTX
Always send lights to sky shader if using sun scatter
2 parents 5c7c527 + e659daf commit 0564019

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

drivers/gles3/rasterizer_scene_gles3.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -684,7 +684,7 @@ void RasterizerSceneGLES3::_setup_sky(const RenderDataGLES3 *p_render_data, cons
684684
}
685685

686686
glBindBufferBase(GL_UNIFORM_BUFFER, SKY_DIRECTIONAL_LIGHT_UNIFORM_LOCATION, sky_globals.directional_light_buffer);
687-
if (shader_data->uses_light) {
687+
if (shader_data->uses_light || (environment_get_fog_enabled(p_render_data->environment) && environment_get_fog_sun_scatter(p_render_data->environment) > 0.001)) {
688688
sky_globals.directional_light_count = 0;
689689
for (int i = 0; i < (int)p_lights.size(); i++) {
690690
GLES3::LightInstance *li = GLES3::LightStorage::get_singleton()->get_light_instance(p_lights[i]);

servers/rendering/renderer_rd/environment/sky.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1065,7 +1065,7 @@ void SkyRD::setup_sky(const RenderDataRD *p_render_data, const Size2i p_screen_s
10651065
}
10661066

10671067
sky_scene_state.ubo.directional_light_count = 0;
1068-
if (shader_data->uses_light) {
1068+
if (shader_data->uses_light || (RendererSceneRenderRD::get_singleton()->environment_get_fog_enabled(p_render_data->environment) && RendererSceneRenderRD::get_singleton()->environment_get_fog_sun_scatter(p_render_data->environment) > 0.001)) {
10691069
const PagedArray<RID> &lights = *p_render_data->lights;
10701070
// Run through the list of lights in the scene and pick out the Directional Lights.
10711071
// This can't be done in RenderSceneRenderRD::_setup lights because that needs to be called

0 commit comments

Comments
 (0)