godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #53954 from Chaosus/fix_quit_errors

Browse Source
This commit is contained in:
Rémi Verschelde 2022-01-25 20:09:52 +01:00 committed by GitHub
commit d9fd16c8e4
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() { ProceduralSkyMaterial::~ProceduralSkyMaterial() {
RS::get_singleton()->material_set_shader(_get_material(), RID());
} }
///////////////////////////////////////// /////////////////////////////////////////
@ -389,7 +388,6 @@ PanoramaSkyMaterial::PanoramaSkyMaterial() {
} }
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

@ -1920,6 +1920,11 @@ void RendererSceneRenderRD::_free_render_buffer_data(RenderBuffers *rb) {
rb->ambient_buffer = RID(); rb->ambient_buffer = RID();
rb->reflection_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) { void RendererSceneRenderRD::_process_sss(RID p_render_buffers, const CameraMatrix &p_camera) {

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

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