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

Fix crash in StaticModel::GetMaterial when model is not loaded or has invalid entries count

Browse Source
This commit is contained in:
Wojtek Figat
2024-03-12 13:05:02 +01:00
parent 8f2bc17a94
commit e12919da98
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -553,13 +553,11 @@ const Span<MaterialSlot> StaticModel::GetMaterialSlots() const
MaterialBase* StaticModel::GetMaterial(int32 entryIndex) MaterialBase* StaticModel::GetMaterial(int32 entryIndex)
{ {
if (Model) if (!Model || Model->WaitForLoaded())
Model->WaitForLoaded();
else
return nullptr; return nullptr;
CHECK_RETURN(entryIndex >= 0 && entryIndex < Entries.Count(), nullptr); CHECK_RETURN(entryIndex >= 0 && entryIndex < Entries.Count(), nullptr);
MaterialBase* material = Entries[entryIndex].Material.Get(); MaterialBase* material = Entries[entryIndex].Material.Get();
if (!material) if (!material && entryIndex < Model->MaterialSlots.Count())
{ {
material = Model->MaterialSlots[entryIndex].Material.Get(); material = Model->MaterialSlots[entryIndex].Material.Get();
if (!material) if (!material)