Flax/FlaxEngine
3
0
Fork 0
Code Issues Pull Requests Releases Activity

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

Browse Source 
# Conflicts:
#	Content/Shaders/DepthOfField.flax
#	Source/Engine/Content/Asset.cpp
This commit is contained in:
Wojciech Figat
2026-06-30 10:06:55 +02:00
parent e721171921 9952d6cbf8
commit 1915aa3c06
64 changed files with 1222 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Engine/Level/Actors/AnimatedModel.cpp
+2 -2
View File
@@ -1516,8 +1516,8 @@ MaterialBase* AnimatedModel::GetMaterial(int32 entryIndex)
SkinnedModel->WaitForLoaded();
else
return nullptr;
CHECK_RETURN(entryIndex >= 0 && entryIndex < Entries.Count(), nullptr);
MaterialBase* material = Entries[entryIndex].Material.Get();
CHECK_RETURN(entryIndex >= 0 && entryIndex < SkinnedModel->MaterialSlots.Count(), nullptr);
MaterialBase* material = entryIndex < Entries.Count() ? Entries[entryIndex].Material.Get() : nullptr;
if (!material)
{
material = SkinnedModel->MaterialSlots[entryIndex].Material.Get();