Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-25 21:52:51 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #72433 from clayjohn/Pointlight2D-crash

Browse Source 
Avoid crash when CanvasTexture used with light decal atlas
This commit is contained in:
Rémi Verschelde 2023-01-31 10:54:02 +01:00
commit c24e0065b2
No known key found for this signature in database
GPG Key ID: C3336907360768E1
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gles3/rasterizer_canvas_gles3.cpp
View File

@ -1499,6 +1499,9 @@ void RasterizerCanvasGLES3::light_set_texture(RID p_rid, RID p_texture) {
if (cl->texture == p_texture) {
return;
}
ERR_FAIL_COND(p_texture.is_valid() && !texture_storage->owns_texture(p_texture));
if (cl->texture.is_valid()) {
texture_storage->texture_remove_from_texture_atlas(cl->texture);
}

3
servers/rendering/renderer_rd/renderer_canvas_render_rd.cpp
View File

@ -1550,6 +1550,9 @@ void RendererCanvasRenderRD::light_set_texture(RID p_rid, RID p_texture) {
if (cl->texture == p_texture) {
return;
}
ERR_FAIL_COND(p_texture.is_valid() && !texture_storage->owns_texture(p_texture));
if (cl->texture.is_valid()) {
texture_storage->texture_remove_from_decal_atlas(cl->texture);
}

2
servers/rendering/renderer_rd/storage_rd/light_storage.cpp
View File

@ -232,6 +232,8 @@ void LightStorage::light_set_projector(RID p_light, RID p_texture) {
return;
}
ERR_FAIL_COND(p_texture.is_valid() && !texture_storage->owns_texture(p_texture));
if (light->type != RS::LIGHT_DIRECTIONAL && light->projector.is_valid()) {
texture_storage->texture_remove_from_decal_atlas(light->projector, light->type == RS::LIGHT_OMNI);
}