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

Fix potential crashes if uses calls terrain tools with invalid params

Browse Source
This commit is contained in:
Wojtek Figat
2023-10-08 17:02:26 +02:00
parent 4bfc97d982
commit 552641c51a
3 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Engine/Terrain/TerrainPatch.cpp
View File

@@ -1126,12 +1126,9 @@ bool TerrainPatch::InitializeHeightMap()
float* TerrainPatch::GetHeightmapData()
{
PROFILE_CPU_NAMED("Terrain.GetHeightmapData");
if (_cachedHeightMap.HasItems())
return _cachedHeightMap.Get();
CacheHeightData();
return _cachedHeightMap.Get();
}
@@ -1144,12 +1141,9 @@ void TerrainPatch::ClearHeightmapCache()
byte* TerrainPatch::GetHolesMaskData()
{
PROFILE_CPU_NAMED("Terrain.GetHolesMaskData");
if (_cachedHolesMask.HasItems())
return _cachedHolesMask.Get();
CacheHeightData();
return _cachedHolesMask.Get();
}
@@ -1161,15 +1155,11 @@ void TerrainPatch::ClearHolesMaskCache()
Color32* TerrainPatch::GetSplatMapData(int32 index)
{
ASSERT(index >= 0 && index < TERRAIN_MAX_SPLATMAPS_COUNT);
CHECK_RETURN(index >= 0 && index < TERRAIN_MAX_SPLATMAPS_COUNT, nullptr);
PROFILE_CPU_NAMED("Terrain.GetSplatMapData");
if (_cachedSplatMap[index].HasItems())
return _cachedSplatMap[index].Get();
CacheSplatData();
return _cachedSplatMap[index].Get();
}