From dd92108759f33d190f87cd59aa7ab20c7bbf26fa Mon Sep 17 00:00:00 2001
From: BlueCube3310 <53150244+BlueCube3310@users.noreply.github.com>
Date: Wed, 1 Oct 2025 19:18:09 +0200
Subject: [PATCH] Fix LightmapGI not being correctly applied to objects

(cherry picked from commit 24ed12d4a3e92acc541c2dfaa9ec5c2a582bc50e)
---
 .../renderer_rd/forward_clustered/render_forward_clustered.cpp  | 2 +-
 .../renderer_rd/forward_mobile/render_forward_mobile.cpp        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/servers/rendering/renderer_rd/forward_clustered/render_forward_clustered.cpp b/servers/rendering/renderer_rd/forward_clustered/render_forward_clustered.cpp
index 1d2f230451c..3fe0542bd4d 100644
--- a/servers/rendering/renderer_rd/forward_clustered/render_forward_clustered.cpp
+++ b/servers/rendering/renderer_rd/forward_clustered/render_forward_clustered.cpp
@@ -846,7 +846,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;
diff --git a/servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.cpp b/servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.cpp
index 875989de4ba..d0bea91ab05 100644
--- a/servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.cpp
+++ b/servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.cpp
@@ -1975,7 +1975,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) {