Merge remote-tracking branch 'origin/master' into 1.6

2023-06-11 21:38:20 +02:00
parent 652f8ccb8d 5f8e5d44dc
commit 7140c4a2d8
20 changed files with 212 additions and 93 deletions
--- a/Source/Engine/Terrain/TerrainChunk.cpp
+++ b/Source/Engine/Terrain/TerrainChunk.cpp
@@ -287,7 +287,7 @@ void TerrainChunk::Serialize(SerializeStream& stream, const void* otherObj)

    if (HasLightmap()
 #if USE_EDITOR
-        && PrefabManager::IsNotCreatingPrefab
+        && !PrefabManager::IsCreatingPrefab
 #endif
    )
    {