hertog/godot-module-template
Template
2
1
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #115874 from clayjohn/sky-crash

Browse source 
Avoid reading from sky pointer when rendering background without sky
This commit is contained in:
Thaddeus Crews 2026-02-05 09:32:29 -06:00
commit 7e91c61fec
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
servers/rendering/renderer_rd/environment/sky.cpp
View file

@ -1500,13 +1500,15 @@ void SkyRD::draw_sky(RD::DrawListID p_draw_list, Ref<RenderSceneBuffersRD> p_ren
PipelineCacheRD *pipeline = &shader_data->pipelines[sky_scene_state.view_count > 1 ? SKY_VERSION_BACKGROUND_MULTIVIEW : SKY_VERSION_BACKGROUND];
RID texture_uniform_set;
float border_size = 0.0;
if (sky) {
texture_uniform_set = sky->get_textures(SKY_TEXTURE_SET_BACKGROUND, sky_shader.default_shader_rd, p_render_buffers);
border_size = sky->uv_border_size;
} else {
texture_uniform_set = sky_scene_state.fog_only_texture_uniform_set;
}
_render_sky(p_draw_list, p_time, p_fb, pipeline, material->uniform_set, texture_uniform_set, projection, sky_transform, sky_scene_state.cam_transform.origin, p_luminance_multiplier, p_brightness_multiplier, sky->uv_border_size);
_render_sky(p_draw_list, p_time, p_fb, pipeline, material->uniform_set, texture_uniform_set, projection, sky_transform, sky_scene_state.cam_transform.origin, p_luminance_multiplier, p_brightness_multiplier, border_size);
}
void SkyRD::invalidate_sky(Sky *p_sky) {