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

Fix loading models with no meshes

Browse Source
This commit is contained in:
Wojtek Figat
2025-06-03 12:28:17 +02:00
parent 077f7a3cd1
commit 2fd9b4a62a
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Editor/Windows/Assets/ModelBaseWindow.cs
View File

@@ -254,7 +254,8 @@ namespace FlaxEditor.Windows.Assets
if (lodIndex >= countLODs - loadedLODs) if (lodIndex >= countLODs - loadedLODs)
{ {
var mesh = lod.GetMesh(0); var mesh = lod.GetMesh(0);
vertexLayout = mesh.VertexLayout; if (mesh != null)
vertexLayout = mesh.VertexLayout;
if (vertexLayout != null && vertexLayout.Elements.Length != 0) if (vertexLayout != null && vertexLayout.Elements.Length != 0)
break; break;
vertexLayout = null; vertexLayout = null;

4
Source/Engine/Content/Assets/Model.cpp
View File

@@ -324,7 +324,7 @@ bool Model::Init(const Span<int32>& meshesCountPerLod)
lod.Link(this, lodIndex); lod.Link(this, lodIndex);
lod.ScreenSize = 1.0f; lod.ScreenSize = 1.0f;
const int32 meshesCount = meshesCountPerLod[lodIndex]; const int32 meshesCount = meshesCountPerLod[lodIndex];
if (meshesCount <= 0 || meshesCount > MODEL_MAX_MESHES) if (meshesCount < 0 || meshesCount > MODEL_MAX_MESHES)
return true; return true;
lod.Meshes.Resize(meshesCount); lod.Meshes.Resize(meshesCount);
@@ -362,7 +362,7 @@ bool Model::LoadHeader(ReadStream& stream, byte& headerVersion)
// Meshes // Meshes
uint16 meshesCount; uint16 meshesCount;
stream.ReadUint16(&meshesCount); stream.ReadUint16(&meshesCount);
if (meshesCount == 0 || meshesCount > MODEL_MAX_MESHES) if (meshesCount > MODEL_MAX_MESHES)
return true; return true;
ASSERT(lodIndex == 0 || LODs[0].Meshes.Count() >= meshesCount); ASSERT(lodIndex == 0 || LODs[0].Meshes.Count() >= meshesCount);
lod.Meshes.Resize(meshesCount, false); lod.Meshes.Resize(meshesCount, false);

2
Source/Engine/Content/Assets/SkinnedModel.cpp
View File

@@ -476,7 +476,7 @@ bool SkinnedModel::Init(const Span<int32>& meshesCountPerLod)
lod._lodIndex = lodIndex; lod._lodIndex = lodIndex;
lod.ScreenSize = 1.0f; lod.ScreenSize = 1.0f;
const int32 meshesCount = meshesCountPerLod[lodIndex]; const int32 meshesCount = meshesCountPerLod[lodIndex];
if (meshesCount <= 0 || meshesCount > MODEL_MAX_MESHES) if (meshesCount < 0 || meshesCount > MODEL_MAX_MESHES)
return true; return true;
lod.Meshes.Resize(meshesCount); lod.Meshes.Resize(meshesCount);