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

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

Browse Source
This commit is contained in:
Wojtek Figat
2023-06-10 23:29:22 +02:00
parent 8cf10bf71d 3bbfe9de8a
commit f552dd0c28
21 changed files with 438 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Engine/Tools/ModelTool/ModelTool.cpp
View File

@@ -1380,7 +1380,7 @@ bool ModelTool::ImportModel(const String& path, ModelData& meshData, Options& op
}
// Automatic LOD generation
if (options.GenerateLODs && data.LODs.HasItems() && options.TriangleReduction < 1.0f - ZeroTolerance)
if (options.GenerateLODs && options.LODCount > 1 && data.LODs.HasItems() && options.TriangleReduction < 1.0f - ZeroTolerance)
{
auto lodStartTime = DateTime::NowUTC();
meshopt_setAllocator(MeshOptAllocate, MeshOptDeallocate);