Skip to content

Commit 5b6d9a7

Browse files
committed
Merge pull request godotengine#95659 from clayjohn/RD-sky-affect
Ensure `fog_sky_affect` is used even when using a background color
2 parents 2af825c + 37be585 commit 5b6d9a7

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

servers/rendering/renderer_rd/forward_clustered/render_forward_clustered.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1827,7 +1827,7 @@ void RenderForwardClustered::_render_scene(RenderDataRD *p_render_data, const Co
18271827
clear_color.r *= bg_energy_multiplier;
18281828
clear_color.g *= bg_energy_multiplier;
18291829
clear_color.b *= bg_energy_multiplier;
1830-
if (!p_render_data->transparent_bg && rb->has_custom_data(RB_SCOPE_FOG) && environment_get_fog_enabled(p_render_data->environment)) {
1830+
if (!p_render_data->transparent_bg && (rb->has_custom_data(RB_SCOPE_FOG) || environment_get_fog_enabled(p_render_data->environment))) {
18311831
draw_sky_fog_only = true;
18321832
RendererRD::MaterialStorage::get_singleton()->material_set_param(sky.sky_scene_state.fog_material, "clear_color", Variant(clear_color.srgb_to_linear()));
18331833
}
@@ -1837,7 +1837,7 @@ void RenderForwardClustered::_render_scene(RenderDataRD *p_render_data, const Co
18371837
clear_color.r *= bg_energy_multiplier;
18381838
clear_color.g *= bg_energy_multiplier;
18391839
clear_color.b *= bg_energy_multiplier;
1840-
if (!p_render_data->transparent_bg && rb->has_custom_data(RB_SCOPE_FOG) && environment_get_fog_enabled(p_render_data->environment)) {
1840+
if (!p_render_data->transparent_bg && (rb->has_custom_data(RB_SCOPE_FOG) || environment_get_fog_enabled(p_render_data->environment))) {
18411841
draw_sky_fog_only = true;
18421842
RendererRD::MaterialStorage::get_singleton()->material_set_param(sky.sky_scene_state.fog_material, "clear_color", Variant(clear_color.srgb_to_linear()));
18431843
}

0 commit comments

Comments
 (0)