GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash on prefab preview with lightmap in use

Browse Source 
#2454
This commit is contained in:
Wojtek Figat
2024-04-20 15:51:20 +02:00
parent 41ffc16b66
commit 5e086809ae
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Engine/Foliage/Foliage.cpp
View File

@@ -115,7 +115,7 @@ void Foliage::DrawInstance(RenderContext& renderContext, FoliageInstance& instan
e = &result[key]; e = &result[key];
ASSERT_LOW_LAYER(key.Mat); ASSERT_LOW_LAYER(key.Mat);
e->DrawCall.Material = key.Mat; e->DrawCall.Material = key.Mat;
e->DrawCall.Surface.Lightmap = EnumHasAnyFlags(_staticFlags, StaticFlags::Lightmap) ? _scene->LightmapsData.GetReadyLightmap(key.Lightmap) : nullptr; e->DrawCall.Surface.Lightmap = EnumHasAnyFlags(_staticFlags, StaticFlags::Lightmap) && _scene ? _scene->LightmapsData.GetReadyLightmap(key.Lightmap) : nullptr;
} }
// Add instance to the draw batch // Add instance to the draw batch
@@ -1172,7 +1172,7 @@ void Foliage::Draw(RenderContext& renderContext)
draw.ForcedLOD = -1; draw.ForcedLOD = -1;
draw.SortOrder = 0; draw.SortOrder = 0;
draw.VertexColors = nullptr; draw.VertexColors = nullptr;
draw.Lightmap = _scene->LightmapsData.GetReadyLightmap(instance.Lightmap.TextureIndex); draw.Lightmap = _scene ? _scene->LightmapsData.GetReadyLightmap(instance.Lightmap.TextureIndex) : nullptr;
draw.LightmapUVs = &instance.Lightmap.UVsArea; draw.LightmapUVs = &instance.Lightmap.UVsArea;
draw.Buffer = &type.Entries; draw.Buffer = &type.Entries;
draw.World = &world; draw.World = &world;

4
Source/Engine/Level/Actors/StaticModel.cpp
View File

@@ -346,7 +346,7 @@ void StaticModel::Draw(RenderContext& renderContext)
draw.World = &world; draw.World = &world;
draw.DrawState = &_drawState; draw.DrawState = &_drawState;
draw.Deformation = _deformation; draw.Deformation = _deformation;
draw.Lightmap = _scene->LightmapsData.GetReadyLightmap(Lightmap.TextureIndex); draw.Lightmap = _scene ? _scene->LightmapsData.GetReadyLightmap(Lightmap.TextureIndex) : nullptr;
draw.LightmapUVs = &Lightmap.UVsArea; draw.LightmapUVs = &Lightmap.UVsArea;
draw.Flags = _staticFlags; draw.Flags = _staticFlags;
draw.DrawModes = DrawModes; draw.DrawModes = DrawModes;
@@ -380,7 +380,7 @@ void StaticModel::Draw(RenderContextBatch& renderContextBatch)
draw.World = &world; draw.World = &world;
draw.DrawState = &_drawState; draw.DrawState = &_drawState;
draw.Deformation = _deformation; draw.Deformation = _deformation;
draw.Lightmap = _scene->LightmapsData.GetReadyLightmap(Lightmap.TextureIndex); draw.Lightmap = _scene ? _scene->LightmapsData.GetReadyLightmap(Lightmap.TextureIndex) : nullptr;
draw.LightmapUVs = &Lightmap.UVsArea; draw.LightmapUVs = &Lightmap.UVsArea;
draw.Flags = _staticFlags; draw.Flags = _staticFlags;
draw.DrawModes = DrawModes; draw.DrawModes = DrawModes;