Merge pull request #111125 from BlueCube3310/lightmap-sort-bitshift

Fix LightmapGI not being correctly applied to objects
This commit is contained in:
Rémi Verschelde 2025-10-06 14:08:07 +02:00
commit 900bd07d10
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 2 additions and 2 deletions

View file

@ -844,7 +844,7 @@ void RenderForwardClustered::_fill_instance_data(RenderListType p_render_list, i
RenderElementInfo &element_info = rl->element_info[p_offset + i];
element_info.value = uint32_t(surface->sort.sort_key2 & 0x0FFF00000000);
element_info.value = uint32_t((surface->sort.sort_key2 & 0x0FFF00000000) >> 32u);
if (cant_repeat) {
prev_surface = nullptr;

View file

@ -1976,7 +1976,7 @@ void RenderForwardMobile::_fill_instance_data(RenderListType p_render_list, uint
RenderElementInfo &element_info = rl->element_info[p_offset + i];
// Sets lod_index and uses_lightmap at once.
element_info.value = uint32_t(surface->sort.sort_key2 & 0x01FF00000000);
element_info.value = uint32_t((surface->sort.sort_key2 & 0x01FF00000000) >> 32u);
}
if (p_update_buffer) {