maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge 26a26d6657 into 3668312e78

Browse source
This commit is contained in:
Yuri Roubinsky 2021-11-10 23:33:30 +03:00 committed by GitHub
parent 3668312e78 26a26d6657
commit 8e9de5ef3c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scene/resources/sky_material.cpp
View file

@ -292,7 +292,6 @@ ProceduralSkyMaterial::ProceduralSkyMaterial() {
}
ProceduralSkyMaterial::~ProceduralSkyMaterial() {
RS::get_singleton()->material_set_shader(_get_material(), RID());
}
/////////////////////////////////////////
@ -368,7 +367,6 @@ PanoramaSkyMaterial::PanoramaSkyMaterial() {
}
PanoramaSkyMaterial::~PanoramaSkyMaterial() {
RS::get_singleton()->material_set_shader(_get_material(), RID());
}
//////////////////////////////////

5
servers/rendering/renderer_rd/renderer_scene_render_rd.cpp
View file

@ -1812,6 +1812,11 @@ void RendererSceneRenderRD::_free_render_buffer_data(RenderBuffers *rb) {
rb->ambient_buffer = RID();
rb->reflection_buffer = RID();
}
if (rb->gi.voxel_gi_buffer.is_valid()) {
RD::get_singleton()->free(rb->gi.voxel_gi_buffer);
rb->gi.voxel_gi_buffer = RID();
}
}
void RendererSceneRenderRD::_process_sss(RID p_render_buffers, const CameraMatrix &p_camera) {

1
servers/rendering/renderer_rd/renderer_scene_sky_rd.cpp
View file

@ -581,6 +581,7 @@ void RendererSceneSkyRD::Sky::free(RendererStorageRD *p_storage) {
if (material.is_valid()) {
p_storage->free(material);
material = RID();
}
}