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.10

Browse Source 
# Conflicts:
#	Source/Editor/Windows/Profiler/Memory.cs
This commit is contained in:
Wojtek Figat
2025-03-25 13:37:15 +01:00
parent 9cf7046a5b 9459eff58c
commit 7e145c56fd
94 changed files with 901 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -738,7 +738,7 @@ void Animation::unload(bool isReloading)
Level::ScriptsReloadStart.Unbind<Animation, &Animation::OnScriptsReloadStart>(this);
}
#endif
Data.Dispose();
Data.Release();
for (const auto& e : Events)
{
for (const auto& k : e.Second.GetKeyframes())

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

@@ -203,7 +203,7 @@ void AnimationGraph::FindDependencies(AnimGraphBase* graph)
{
for (const auto& node : graph->Nodes)
{
if (node.Type == GRAPH_NODE_MAKE_TYPE(9, 24))
if (node.Type == GRAPH_NODE_MAKE_TYPE(9, 24) && node.Assets.Count() > 0)
{
const auto function = node.Assets[0].As<AnimationGraphFunction>();
if (function)