Merge pull request #1181 from CesiumGS/lighting-guid

Don't crash when building lighting for a level with a Cesium3DTileset
CesiumGS · Jul 31, 2023 · 5746e2c · 5746e2c
2 parents 5e76933 + 765d3e2
commit 5746e2c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -20,6 +20,7 @@
 - `ACesiumGeoreference`, `ACesiumCameraManager`, and `ACesiumCreditSystem` are now created in the Persistent Level, even if the object that triggered their automatic creation (such as `ACesium3DTileset`) exists in a sub-level. It is very rarely useful to have instances of these objects within a sub-level.
 - An instance of `ACesiumCreditSystem` in a sub-level will no longer cause overlapping and broken-looking credits. However, we still recommend deleting credit system instances from sub-levels.
 - Fixed a bug introduced in v1.28.0 that prevented point clouds from rendering with attenuation.
+- Fixed a bug that caused `UnrealLightmass` to crash when attempting to build lighting containing static meshes created by a `Cesium3DTileset`.
 - Fixed a bug where Google Photorealistic 3D Tiles would sometimes not render in Movie Render Queue.
 
 ### v1.28.0 - 2023-07-03

diff --git a/Source/CesiumRuntime/Private/CesiumGltfComponent.cpp b/Source/CesiumRuntime/Private/CesiumGltfComponent.cpp
@@ -2134,6 +2134,7 @@ static void loadPrimitiveGameThreadPart(
 
   pStaticMesh->AddMaterial(pMaterial);
 
+  pStaticMesh->SetLightingGuid();
   pStaticMesh->InitResources();
 
   // Set up RenderData bounds and LOD data